structured-fw 1.0.0 → 1.0.2

package/build/system/server/Component.js

@@ -89,17 +89,19 @@ export class Component extends EventEmitter {
             return;
         }
         const importedParentData = this.parent ? this.importedParentData(this.parent.data) : {};
+        const dataServerSidePart = (this.entry && this.entry.module ?
+            await this.entry.module.getData(Object.assign(importedParentData, this.attributes, data || {}), this.document.ctx, this.document.application, this) : {}) || {};
         if (data === undefined) {
             if (this.entry && this.entry.module) {
-                this.data = Object.assign(this.data, await this.entry.module.getData(Object.assign(importedParentData, this.attributes), this.document.ctx, this.document.application, this) || {});
+                this.data = Object.assign(this.data, dataServerSidePart);
             }
             else {
                 this.attributes = Object.assign(importedParentData, this.attributes);
-                this.data = Object.assign(exportedContextData, this.attributes);
+                this.data = Object.assign(this.data, this.attributes);
             }
         }
         else {
-            this.data = Object.assign(exportedContextData, Object.assign(importedParentData, data), this.attributes);
+            this.data = Object.assign(this.data, Object.assign(importedParentData, data), this.attributes, dataServerSidePart);
         }
         this.fillData(this.data);
         if (this.entry === null || this.entry.exportData) {

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/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",
@@ -36,8 +36,7 @@
   },
   "dependencies": {
     "handlebars": "^4.7.8",
-    "mime-types": "^3.0.0",
-    "ts-md5": "^1.3.1"
+    "mime-types": "^3.0.0"
   },
   "files": [
     "build/system/*",