structured-fw 1.0.1 → 1.0.3

package/build/system/server/FormValidation.d.ts

@@ -2,6 +2,7 @@ import { FormValidationEntry, PostedDataDecoded, ValidationResult, ValidationRul
 export declare class FormValidation {
     fieldRules: Array<FormValidationEntry>;
     singleError: boolean;
+    customValidators: Array<string>;
     validators: {
         [name: string]: ValidatorFunction;
     };

package/build/system/server/FormValidation.js

@@ -2,6 +2,7 @@ export class FormValidation {
     constructor() {
         this.fieldRules = [];
         this.singleError = false;
+        this.customValidators = [];
         this.validators = {
             'required': async (data, field) => {
                 if (!(field in data)) {
@@ -124,6 +125,7 @@ export class FormValidation {
         if (typeof decorator === 'function') {
             this.decorators[name] = decorator;
         }
+        this.customValidators.push(name);
     }
     registerDecorator(name, decorator) {
         this.decorators[name] = decorator;
@@ -138,7 +140,10 @@ export class FormValidation {
             const isRequired = entry.rules.includes('required');
             const value = data[entry.field[0]];
             const possiblyValidDataExists = typeof value === 'string';
-            const isContent = !isRequired && (!possiblyValidDataExists || value.trim().length === 0);
+            const usesCustomValidators = this.fieldRules[i].rules.some((rule) => {
+                return this.customValidators.includes(rule);
+            });
+            const isContent = !usesCustomValidators && !isRequired && (!possiblyValidDataExists || value.trim().length === 0);
             if (!isContent) {
                 for (let j = 0; j < entry.rules.length; j++) {
                     const rule = entry.rules[j];

package/build/system/server/Request.js

@@ -351,12 +351,17 @@ export class Request {
     static parseBodyMultipart(bodyRaw, boundary) {
         const pairsRaw = bodyRaw.split(boundary);
         const pairs = pairsRaw.map((pair) => {
-            const parts = /Content-Disposition: form-data; name="([^\r\n"]+)"\r?\n\r?\n([^$]+)/m.exec(pair);
-            if (parts) {
-                return {
-                    key: parts[1],
-                    value: parts[2]
-                };
+            const parts = pair.split(/\r?\n\r?\n/, 2).filter((part) => { return part.length > 0; });
+            if (parts.length > 0) {
+                const header = parts[0];
+                const data = typeof parts[1] === 'string' ? parts[1].trim() : '';
+                const headerParts = /Content-Disposition: form-data; name="([^\r\n"]+)"/m.exec(header);
+                if (headerParts) {
+                    return {
+                        key: headerParts[1],
+                        value: data
+                    };
+                }
             }
             return null;
         });

package/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",