structured-fw 0.9.2 → 0.9.3

package/build/system/Util.js

@@ -215,8 +215,9 @@ function base64ToBytes(base64) {
     return Uint8Array.from(binString, (m) => m.codePointAt(0));
 }
 function bytesToBase64(bytes) {
-    const binString = String.fromCodePoint(...bytes);
-    return btoa(binString);
+    return btoa(bytes.reduce((prev, curr) => {
+        return prev + String.fromCharCode(curr);
+    }, ''));
 }
 export function attributeValueToString(key, value) {
     return 'base64:' + bytesToBase64(new TextEncoder().encode(JSON.stringify({ key, value })));

package/build/system/server/Component.js

@@ -88,19 +88,18 @@ export class Component extends EventEmitter {
             this.setAttributes({ deferred: true }, 'data-', true);
             return;
         }
-        if (typeof this.attributes.use === 'string' && this.parent !== null) {
-            this.attributes = Object.assign(this.importedParentData(this.parent.data) || {}, this.attributes);
-        }
+        const importedParentData = this.parent ? this.importedParentData(this.parent.data) : {};
         if (data === undefined) {
             if (this.entry && this.entry.module) {
-                this.data = Object.assign(this.data, await this.entry.module.getData(this.attributes, this.document.ctx, this.document.application, this) || {});
+                this.data = Object.assign(this.data, await this.entry.module.getData(Object.assign(importedParentData, this.attributes), this.document.ctx, this.document.application, this) || {});
             }
             else {
+                this.attributes = Object.assign(importedParentData, this.attributes);
                 this.data = Object.assign(exportedContextData, this.attributes);
             }
         }
         else {
-            this.data = Object.assign(exportedContextData, data, this.attributes);
+            this.data = Object.assign(exportedContextData, Object.assign(importedParentData, data), this.attributes);
         }
         this.fillData(this.data);
         if (this.entry === null || this.entry.exportData) {

package/package.json

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