structured-fw 0.9.9 → 1.0.1

package/build/system/Util.js

@@ -230,7 +230,7 @@ export function attributeValueFromString(attributeValue) {
                 return attributeValue;
             }
             const valObj = JSON.parse(decoded);
-            if (!('value' in valObj) || !('key' in valObj)) {
+            if (!('key' in valObj)) {
                 return decoded;
             }
             return valObj;

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

@@ -19,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "0.9.9",
+  "version": "1.0.1",
   "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/*",