structured-fw 1.7.7 → 1.7.8

package/build/system/Util.d.ts

@@ -20,12 +20,13 @@ export declare function fromSerializableValue(data: SerializableUint8Array): Uin
 export declare function fromSerializableValue(data: Serializable): any;
 export declare function serializableObject(data: LooseObject): LooseObject;
 export declare function deserializeObject(data: LooseObject): LooseObject;
+export declare function escapeAttributeValue(value: string): string;
+export declare function unescapeAttributeValue(str: string): string;
 export declare function attributeValueToString(key: string, value: any): string;
 export declare function attributeValueFromString(attributeValue: string): string | {
     key: string;
     value: any;
 };
-export declare function attributeValueEscape(str: string): string;
 export declare function isObject(value: any): boolean;
 export declare function equalDeep(a: LooseObject, b: LooseObject): boolean;
 export declare function mergeDeep(target: any, ...sources: Array<any>): LooseObject;

package/build/system/Util.js

@@ -226,33 +226,24 @@ export function stripTags(contentWithHTML, keepTags = []) {
         return sub.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
     });
 }
-function base64ToBytes(base64) {
-    const binString = atob(base64);
-    return Uint8Array.from(binString, (m) => m.codePointAt(0));
-}
-function bytesToBase64(bytes) {
-    return btoa(bytes.reduce((prev, curr) => {
-        return prev + String.fromCharCode(curr);
-    }, ''));
-}
 export function toSerializableValue(value) {
     if (value instanceof Date) {
         return {
-            __structured_value: true,
+            __sv: 1,
             type: 'date',
             value: value.toISOString(),
         };
     }
     if (typeof value === 'bigint') {
         return {
-            __structured_value: true,
+            __sv: 1,
             type: 'bigint',
             value: value.toString(),
         };
     }
     if (value instanceof RegExp) {
         return {
-            __structured_value: true,
+            __sv: 1,
             type: 'regexp',
             value: {
                 source: value.source,
@@ -262,20 +253,20 @@ export function toSerializableValue(value) {
     }
     if (value instanceof Map) {
         return {
-            __structured_value: true,
+            __sv: 1,
             type: 'map',
             value: [...value.entries()],
         };
     }
     if (value instanceof Uint8Array) {
         return {
-            __structured_value: true,
+            __sv: 1,
             type: 'uint8array',
             value: Array.from(value),
         };
     }
     return {
-        __structured_value: true,
+        __sv: 1,
         value,
     };
 }
@@ -316,7 +307,7 @@ export function deserializeObject(data) {
     const copy = {};
     objectEach(data, (key, val) => {
         if (typeof val === 'object' && val !== null && val !== undefined) {
-            if ('__structured_value' in val) {
+            if ('__sv' in val) {
                 copy[key] = fromSerializableValue(val);
             }
             else {
@@ -329,17 +320,26 @@ export function deserializeObject(data) {
     });
     return copy;
 }
+export function escapeAttributeValue(value) {
+    return value
+        .replace(/~/g, '~~')
+        .replace(/"/g, '~q');
+}
+export function unescapeAttributeValue(str) {
+    const tempToken = `--${randomString(10)}--`;
+    return str
+        .split('~~').join(tempToken)
+        .split('~q').join('"')
+        .split(tempToken).join('~');
+}
 export function attributeValueToString(key, value) {
     const data = serializableObject({ key, data: value });
-    return 'base64:' + bytesToBase64(new TextEncoder().encode(JSON.stringify(data)));
+    return escapeAttributeValue(JSON.stringify(data));
 }
 export function attributeValueFromString(attributeValue) {
-    if (attributeValue.indexOf('base64:') === 0) {
+    if (attributeValue.indexOf('{') === 0) {
         try {
-            const decoded = new TextDecoder().decode(base64ToBytes(attributeValue.substring(7)));
-            if (decoded.indexOf('{') !== 0) {
-                return attributeValue;
-            }
+            const decoded = unescapeAttributeValue(attributeValue);
             const valObj = deserializeObject(JSON.parse(decoded));
             if (!('key' in valObj)) {
                 return decoded;
@@ -355,9 +355,6 @@ export function attributeValueFromString(attributeValue) {
     }
     return attributeValue;
 }
-export function attributeValueEscape(str) {
-    return str.replaceAll('"', '&quot;');
-}
 export function isObject(value) {
     if (value === null || typeof value !== 'object')
         return false;

package/build/system/types/component.types.d.ts

@@ -40,16 +40,16 @@ export type ComponentEvents = {
     ready: undefined;
 };
 export type Serializable = {
-    __structured_value: true;
+    __sv: 1;
     value: any;
 };
 export type SerializableDate = {
-    __structured_value: true;
+    __sv: 1;
     type: 'date';
     value: string;
 };
 export type SerializableRegExp = {
-    __structured_value: true;
+    __sv: 1;
     type: 'regexp';
     value: {
         source: string;
@@ -57,17 +57,17 @@ export type SerializableRegExp = {
     };
 };
 export type SerializableMap = {
-    __structured_value: true;
+    __sv: 1;
     type: 'map';
     value: Array<[any, any]>;
 };
 export type SerializableBigInt = {
-    __structured_value: true;
+    __sv: 1;
     type: 'bigint';
     value: string;
 };
 export type SerializableUint8Array = {
-    __structured_value: true;
+    __sv: 1;
     type: 'uint8array';
     value: Array<number>;
 };

package/package.json

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