@dzeio/schema 0.11.0 → 0.12.0

package/dist/Schema.d.mts

@@ -396,9 +396,12 @@ declare class SchemaDefault<Child extends SchemaItem, Output = SchemaInfer<Child
 declare class SchemaFile extends SchemaItem<File> {
     static readonly id = "file";
     constructor();
-    extension(ext: string, error?: string): this;
+    extension(ext: string | Array<string>, error?: string): this;
+    filenameLimit(limit: number, error?: string): this;
     maxSize(size: number, error?: string): this;
+    filenameTruncate(): this;
     isOfType(input: unknown): input is File;
+    private normalizeFilename;
 }
 
 type TupleToOutputs<Tuple extends Array<SchemaItem>, Result extends Array<any> = []> = number extends Tuple['length'] ? Array<SchemaInfer<Tuple[number]>> : Tuple[Result['length']] extends undefined ? Result : TupleToOutputs<Tuple, [...Result, SchemaInfer<Tuple[Result['length']]>]>;
@@ -451,10 +454,6 @@ declare function parseForm<T extends SchemaItem>(model: T, form: HTMLFormElement
  */
 declare function getSchemaItemAtPath(schema: SchemaItem | undefined, path: Array<string | number>): SchemaItem | undefined;
 
-/**
- * Decorator for modifier functions on SchemaItems to save them in the "savedCalls" property for the serialization
- */
-declare function parsable(): (target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;
 type SchemaItemStatic = (new (...args: Array<any>) => SchemaItem) & {
     id: string;
 };
@@ -512,4 +511,4 @@ declare class Schema<T extends Record<string, SchemaItem> = Record<string, Schem
 }
 declare const s: typeof Schema;
 
-export { type Infer, type InputInfer, type Literal, type Model, type ModelInfer$1 as ModelInfer, SchemaAny, SchemaArray, SchemaBoolean, SchemaDate, SchemaDefault, SchemaEnum, SchemaFile, type SchemaInfer, type SchemaInputInfer, SchemaIntersection, SchemaItem, type SchemaItemJSON, type SchemaJSON, SchemaLiteral, SchemaNever, SchemaNull, SchemaNullable, SchemaNullish, SchemaNumber, SchemaObject, SchemaRecord, SchemaString, SchemaTuple, SchemaUndefined, SchemaUnion, SchemaVoid, type ValidationError, type ValidationOptions, type ValidationResult, type ValidationResultOld, Schema as default, getSchemaItemAtPath, isNull, parsable, parseForm, parseFormData, parseQuery, s };
+export { type Infer, type InputInfer, type Literal, type Model, type ModelInfer$1 as ModelInfer, SchemaAny, SchemaArray, SchemaBoolean, SchemaDate, SchemaDefault, SchemaEnum, SchemaFile, type SchemaInfer, type SchemaInputInfer, SchemaIntersection, SchemaItem, type SchemaItemJSON, type SchemaJSON, SchemaLiteral, SchemaNever, SchemaNull, SchemaNullable, SchemaNullish, SchemaNumber, SchemaObject, SchemaRecord, SchemaString, SchemaTuple, SchemaUndefined, SchemaUnion, SchemaVoid, type ValidationError, type ValidationOptions, type ValidationResult, type ValidationResultOld, Schema as default, getSchemaItemAtPath, isNull, parseForm, parseFormData, parseQuery, s };

package/dist/Schema.d.ts

@@ -396,9 +396,12 @@ declare class SchemaDefault<Child extends SchemaItem, Output = SchemaInfer<Child
 declare class SchemaFile extends SchemaItem<File> {
     static readonly id = "file";
     constructor();
-    extension(ext: string, error?: string): this;
+    extension(ext: string | Array<string>, error?: string): this;
+    filenameLimit(limit: number, error?: string): this;
     maxSize(size: number, error?: string): this;
+    filenameTruncate(): this;
     isOfType(input: unknown): input is File;
+    private normalizeFilename;
 }
 
 type TupleToOutputs<Tuple extends Array<SchemaItem>, Result extends Array<any> = []> = number extends Tuple['length'] ? Array<SchemaInfer<Tuple[number]>> : Tuple[Result['length']] extends undefined ? Result : TupleToOutputs<Tuple, [...Result, SchemaInfer<Tuple[Result['length']]>]>;
@@ -451,10 +454,6 @@ declare function parseForm<T extends SchemaItem>(model: T, form: HTMLFormElement
  */
 declare function getSchemaItemAtPath(schema: SchemaItem | undefined, path: Array<string | number>): SchemaItem | undefined;
 
-/**
- * Decorator for modifier functions on SchemaItems to save them in the "savedCalls" property for the serialization
- */
-declare function parsable(): (target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;
 type SchemaItemStatic = (new (...args: Array<any>) => SchemaItem) & {
     id: string;
 };
@@ -512,4 +511,4 @@ declare class Schema<T extends Record<string, SchemaItem> = Record<string, Schem
 }
 declare const s: typeof Schema;
 
-export { type Infer, type InputInfer, type Literal, type Model, type ModelInfer$1 as ModelInfer, SchemaAny, SchemaArray, SchemaBoolean, SchemaDate, SchemaDefault, SchemaEnum, SchemaFile, type SchemaInfer, type SchemaInputInfer, SchemaIntersection, SchemaItem, type SchemaItemJSON, type SchemaJSON, SchemaLiteral, SchemaNever, SchemaNull, SchemaNullable, SchemaNullish, SchemaNumber, SchemaObject, SchemaRecord, SchemaString, SchemaTuple, SchemaUndefined, SchemaUnion, SchemaVoid, type ValidationError, type ValidationOptions, type ValidationResult, type ValidationResultOld, Schema as default, getSchemaItemAtPath, isNull, parsable, parseForm, parseFormData, parseQuery, s };
+export { type Infer, type InputInfer, type Literal, type Model, type ModelInfer$1 as ModelInfer, SchemaAny, SchemaArray, SchemaBoolean, SchemaDate, SchemaDefault, SchemaEnum, SchemaFile, type SchemaInfer, type SchemaInputInfer, SchemaIntersection, SchemaItem, type SchemaItemJSON, type SchemaJSON, SchemaLiteral, SchemaNever, SchemaNull, SchemaNullable, SchemaNullish, SchemaNumber, SchemaObject, SchemaRecord, SchemaString, SchemaTuple, SchemaUndefined, SchemaUnion, SchemaVoid, type ValidationError, type ValidationOptions, type ValidationResult, type ValidationResultOld, Schema as default, getSchemaItemAtPath, isNull, parseForm, parseFormData, parseQuery, s };

package/dist/Schema.js

@@ -53,7 +53,6 @@ __export(Schema_exports, {
   default: () => Schema,
   getSchemaItemAtPath: () => getSchemaItemAtPath,
   isNull: () => isNull,
-  parsable: () => parsable,
   parseForm: () => parseForm,
   parseFormData: () => parseFormData,
   parseQuery: () => parseQuery,
@@ -157,6 +156,24 @@ function getSchemaItemAtPath(schema, path) {
 
 // src/SchemaItem.ts
 var import_object_util2 = require("@dzeio/object-util");
+
+// src/parsable.ts
+function parsable() {
+  return (target, propertyKey, descriptor) => {
+    if (!(propertyKey in target)) {
+      throw new Error("property not set in object");
+    }
+    const original = target[propertyKey];
+    descriptor.value = function(...args) {
+      this.savedCalls.push({ name: propertyKey, args });
+      const res = original.call(this, ...args);
+      return res;
+    };
+    return descriptor;
+  };
+}
+
+// src/SchemaItem.ts
 var _SchemaItem = class _SchemaItem {
   constructor(items) {
     this.id = this.constructor.id;
@@ -410,7 +427,7 @@ var SchemaDate = class extends SchemaItem {
           if (splitted.length !== 3) {
             break;
           }
-          date = new Date(splitted[2], splitted[1] - 1, splitted[0]);
+          date = /* @__PURE__ */ new Date(`${splitted[0]}-${splitted[1]}-${splitted[2]}`);
           break;
         }
         case "jj/mm/yy": {
@@ -418,7 +435,7 @@ var SchemaDate = class extends SchemaItem {
           if (splitted.length !== 3) {
             break;
           }
-          date = new Date(splitted[2], splitted[1] - 1, splitted[0]);
+          date = /* @__PURE__ */ new Date(`${splitted[2]}-${splitted[1]}-${splitted[0]}`);
           break;
         }
       }
@@ -739,7 +756,8 @@ var SchemaString = class extends SchemaItem {
       if (typeof input !== "string") {
         return input;
       }
-      return input.trim();
+      const invisible = /^\u200B+|\u200B+$/gu;
+      return input.trim().replace(invisible, "");
     });
     return this;
   }
@@ -889,24 +907,85 @@ var SchemaFile = class extends SchemaItem {
     this.addPreProcess((input) => this.isOfType(input) && input.size > 0 ? input : void 0);
   }
   extension(ext, error) {
-    this.addValidation({ fn: (input) => input.name.endsWith(ext), error });
+    this.addValidation({ fn: (input) => {
+      if (!Array.isArray(ext)) {
+        return input.name.endsWith(ext);
+      }
+      for (const possibility of ext) {
+        if (input.name.endsWith(possibility)) {
+          return true;
+        }
+      }
+      return false;
+    }, error });
+    return this;
+  }
+  filenameLimit(limit, error) {
+    if (limit > 255) {
+      throw new Error("Filename limit cannot exceed 255 characters");
+    }
+    if (limit <= 0) {
+      throw new Error("Filename limit must be greater than 0");
+    }
+    this.addValidation({ fn: (file) => file.name.length <= limit, error });
     return this;
   }
   maxSize(size, error) {
     this.addValidation({ fn: (file) => file.size <= size, error });
     return this;
   }
+  filenameTruncate() {
+    this.addPreProcess((input) => this.isOfType(input) ? this.normalizeFilename(input) : input);
+    return this;
+  }
   isOfType(input) {
     return input instanceof File;
   }
+  normalizeFilename(file) {
+    const MAX_FILENAME_BYTES = 255;
+    const encoder = new TextEncoder();
+    if (encoder.encode(file.name).length <= MAX_FILENAME_BYTES) {
+      return file;
+    }
+    const lastDot = file.name.lastIndexOf(".");
+    const hasExtension = lastDot > 0 && lastDot < file.name.length - 1;
+    const extension = hasExtension ? file.name.slice(lastDot) : "";
+    const basename = hasExtension ? file.name.slice(0, lastDot) : file.name;
+    const extensionBytes = encoder.encode(extension).length;
+    const maxBaseBytes = MAX_FILENAME_BYTES - extensionBytes;
+    let result = "";
+    let currentBytes = 0;
+    for (const char of basename) {
+      const charBytes = encoder.encode(char).length;
+      if (currentBytes + charBytes > maxBaseBytes) {
+        break;
+      }
+      result += char;
+      currentBytes += charBytes;
+    }
+    return new File(
+      [file],
+      result + extension,
+      {
+        type: file.type,
+        lastModified: file.lastModified
+      }
+    );
+  }
 };
 SchemaFile.id = "file";
 __decorateClass([
   parsable()
 ], SchemaFile.prototype, "extension", 1);
+__decorateClass([
+  parsable()
+], SchemaFile.prototype, "filenameLimit", 1);
 __decorateClass([
   parsable()
 ], SchemaFile.prototype, "maxSize", 1);
+__decorateClass([
+  parsable()
+], SchemaFile.prototype, "filenameTruncate", 1);
 
 // src/items/tuple.ts
 var SchemaTuple = class extends SchemaItem {
@@ -968,20 +1047,6 @@ SchemaNever.id = "never";
 
 // src/Schema.ts
 var import_object_util6 = require("@dzeio/object-util");
-function parsable() {
-  return (target, propertyKey, descriptor) => {
-    if (!(propertyKey in target)) {
-      throw new Error("property not set in object");
-    }
-    const original = target[propertyKey];
-    descriptor.value = function(...args) {
-      this.savedCalls.push({ name: propertyKey, args });
-      const res = original.call(this, ...args);
-      return res;
-    };
-    return descriptor;
-  };
-}
 var _Schema = class _Schema extends SchemaObject {
   static register(module2) {
     this.registeredModules.push(module2);
@@ -1171,7 +1236,6 @@ var s = Schema;
   SchemaVoid,
   getSchemaItemAtPath,
   isNull,
-  parsable,
   parseForm,
   parseFormData,
   parseQuery,

package/dist/Schema.mjs

@@ -105,6 +105,24 @@ function getSchemaItemAtPath(schema, path) {
 
 // src/SchemaItem.ts
 import { isObject, objectClean, objectRemap, objectSet as objectSet2 } from "@dzeio/object-util";
+
+// src/parsable.ts
+function parsable() {
+  return (target, propertyKey, descriptor) => {
+    if (!(propertyKey in target)) {
+      throw new Error("property not set in object");
+    }
+    const original = target[propertyKey];
+    descriptor.value = function(...args) {
+      this.savedCalls.push({ name: propertyKey, args });
+      const res = original.call(this, ...args);
+      return res;
+    };
+    return descriptor;
+  };
+}
+
+// src/SchemaItem.ts
 var _SchemaItem = class _SchemaItem {
   constructor(items) {
     this.id = this.constructor.id;
@@ -358,7 +376,7 @@ var SchemaDate = class extends SchemaItem {
           if (splitted.length !== 3) {
             break;
           }
-          date = new Date(splitted[2], splitted[1] - 1, splitted[0]);
+          date = /* @__PURE__ */ new Date(`${splitted[0]}-${splitted[1]}-${splitted[2]}`);
           break;
         }
         case "jj/mm/yy": {
@@ -366,7 +384,7 @@ var SchemaDate = class extends SchemaItem {
           if (splitted.length !== 3) {
             break;
           }
-          date = new Date(splitted[2], splitted[1] - 1, splitted[0]);
+          date = /* @__PURE__ */ new Date(`${splitted[2]}-${splitted[1]}-${splitted[0]}`);
           break;
         }
       }
@@ -687,7 +705,8 @@ var SchemaString = class extends SchemaItem {
       if (typeof input !== "string") {
         return input;
       }
-      return input.trim();
+      const invisible = /^\u200B+|\u200B+$/gu;
+      return input.trim().replace(invisible, "");
     });
     return this;
   }
@@ -837,24 +856,85 @@ var SchemaFile = class extends SchemaItem {
     this.addPreProcess((input) => this.isOfType(input) && input.size > 0 ? input : void 0);
   }
   extension(ext, error) {
-    this.addValidation({ fn: (input) => input.name.endsWith(ext), error });
+    this.addValidation({ fn: (input) => {
+      if (!Array.isArray(ext)) {
+        return input.name.endsWith(ext);
+      }
+      for (const possibility of ext) {
+        if (input.name.endsWith(possibility)) {
+          return true;
+        }
+      }
+      return false;
+    }, error });
+    return this;
+  }
+  filenameLimit(limit, error) {
+    if (limit > 255) {
+      throw new Error("Filename limit cannot exceed 255 characters");
+    }
+    if (limit <= 0) {
+      throw new Error("Filename limit must be greater than 0");
+    }
+    this.addValidation({ fn: (file) => file.name.length <= limit, error });
     return this;
   }
   maxSize(size, error) {
     this.addValidation({ fn: (file) => file.size <= size, error });
     return this;
   }
+  filenameTruncate() {
+    this.addPreProcess((input) => this.isOfType(input) ? this.normalizeFilename(input) : input);
+    return this;
+  }
   isOfType(input) {
     return input instanceof File;
   }
+  normalizeFilename(file) {
+    const MAX_FILENAME_BYTES = 255;
+    const encoder = new TextEncoder();
+    if (encoder.encode(file.name).length <= MAX_FILENAME_BYTES) {
+      return file;
+    }
+    const lastDot = file.name.lastIndexOf(".");
+    const hasExtension = lastDot > 0 && lastDot < file.name.length - 1;
+    const extension = hasExtension ? file.name.slice(lastDot) : "";
+    const basename = hasExtension ? file.name.slice(0, lastDot) : file.name;
+    const extensionBytes = encoder.encode(extension).length;
+    const maxBaseBytes = MAX_FILENAME_BYTES - extensionBytes;
+    let result = "";
+    let currentBytes = 0;
+    for (const char of basename) {
+      const charBytes = encoder.encode(char).length;
+      if (currentBytes + charBytes > maxBaseBytes) {
+        break;
+      }
+      result += char;
+      currentBytes += charBytes;
+    }
+    return new File(
+      [file],
+      result + extension,
+      {
+        type: file.type,
+        lastModified: file.lastModified
+      }
+    );
+  }
 };
 SchemaFile.id = "file";
 __decorateClass([
   parsable()
 ], SchemaFile.prototype, "extension", 1);
+__decorateClass([
+  parsable()
+], SchemaFile.prototype, "filenameLimit", 1);
 __decorateClass([
   parsable()
 ], SchemaFile.prototype, "maxSize", 1);
+__decorateClass([
+  parsable()
+], SchemaFile.prototype, "filenameTruncate", 1);
 
 // src/items/tuple.ts
 var SchemaTuple = class extends SchemaItem {
@@ -916,20 +996,6 @@ SchemaNever.id = "never";
 
 // src/Schema.ts
 import { isObject as isObject5, objectRemap as objectRemap2 } from "@dzeio/object-util";
-function parsable() {
-  return (target, propertyKey, descriptor) => {
-    if (!(propertyKey in target)) {
-      throw new Error("property not set in object");
-    }
-    const original = target[propertyKey];
-    descriptor.value = function(...args) {
-      this.savedCalls.push({ name: propertyKey, args });
-      const res = original.call(this, ...args);
-      return res;
-    };
-    return descriptor;
-  };
-}
 var _Schema = class _Schema extends SchemaObject {
   static register(module) {
     this.registeredModules.push(module);
@@ -1119,7 +1185,6 @@ export {
   Schema as default,
   getSchemaItemAtPath,
   isNull,
-  parsable,
   parseForm,
   parseFormData,
   parseQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dzeio/schema",
-	"version": "0.11.0",
+	"version": "0.12.0",
 	"dependencies": {
 		"@dzeio/object-util": "^1.9.2"
 	},
@@ -26,16 +26,21 @@
 		"@eslint/js": "^9.18.0",
 		"@standard-schema/spec": "^1.0.0",
 		"@stylistic/eslint-plugin": "^2.13.0",
+		"@swc/core": "^1.15.43",
 		"@types/bun": "^1.1.18",
 		"@typescript-eslint/eslint-plugin": "^8.21.0",
+		"@vitest/coverage-v8": "^3.0.4",
 		"globals": "^15.14.0",
 		"tsup": "^8.3.6",
 		"typescript": "^5.7.3",
 		"typescript-eslint": "^8.21.0",
+		"unplugin-swc": "^1.5.9",
+		"vite-tsconfig-paths": "^6.1.1",
 		"vitest": "^3.0.4"
 	},
 	"scripts": {
 		"test": "bun test --coverage",
+		"test:node": "vitest run --coverage",
 		"lint": "eslint",
 		"build": "rm -rf dist && tsup ./src/Schema.ts --format cjs,esm --dts --clean",
 		"prepublishOnly": "rm -rf dist && tsup ./src/Schema.ts --format cjs,esm --dts --clean"