valyrian.js 7.2.5 → 7.2.7

package/dist/node/index.js

@@ -223,7 +223,7 @@ var Element = class extends Node {
     this.attributes = [];
     this.childNodes = [];
   }
-  style = new Proxy(
+  _style = new Proxy(
     {},
     {
       get: (state, prop) => state[prop],
@@ -239,6 +239,20 @@ var Element = class extends Node {
       }
     }
   );
+  get style() {
+    return this._style;
+  }
+  set style(value) {
+    if (typeof value === "string") {
+      const regex = /([^:\s]+):\s*((url\([^)]+\))|[^;]+(?=(;|$)))/g;
+      let match;
+      while ((match = regex.exec(value)) !== null) {
+        this._style[match[1]] = match[2].trim();
+      }
+      return;
+    }
+    throw new Error("Cannot set style");
+  }
   classList = {
     toggle: (item, force) => {
       if (item) {
@@ -523,20 +537,20 @@ function getObjectIndexTree(html) {
     let attributesWithValues = string.match(/\S+="[^"]+"/g);
     if (attributesWithValues) {
       for (let attribute of attributesWithValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value.replace(/(^"|"$)/g, "");
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }
     let attributesWithBooleanValues = string.match(/\s\S+=[^"]+/g);
     if (attributesWithBooleanValues) {
       for (let attribute of attributesWithBooleanValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value;
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }

package/dist/node/index.mjs

@@ -185,7 +185,7 @@ var Element = class extends Node {
     this.attributes = [];
     this.childNodes = [];
   }
-  style = new Proxy(
+  _style = new Proxy(
     {},
     {
       get: (state, prop) => state[prop],
@@ -201,6 +201,20 @@ var Element = class extends Node {
       }
     }
   );
+  get style() {
+    return this._style;
+  }
+  set style(value) {
+    if (typeof value === "string") {
+      const regex = /([^:\s]+):\s*((url\([^)]+\))|[^;]+(?=(;|$)))/g;
+      let match;
+      while ((match = regex.exec(value)) !== null) {
+        this._style[match[1]] = match[2].trim();
+      }
+      return;
+    }
+    throw new Error("Cannot set style");
+  }
   classList = {
     toggle: (item, force) => {
       if (item) {
@@ -485,20 +499,20 @@ function getObjectIndexTree(html) {
     let attributesWithValues = string.match(/\S+="[^"]+"/g);
     if (attributesWithValues) {
       for (let attribute of attributesWithValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value.replace(/(^"|"$)/g, "");
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }
     let attributesWithBooleanValues = string.match(/\s\S+=[^"]+/g);
     if (attributesWithBooleanValues) {
       for (let attribute of attributesWithBooleanValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value;
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }

package/dist/node/utils/tree-adapter.d.ts

@@ -38,7 +38,9 @@ export declare class Text extends Node {
 }
 export declare class Element extends Node {
     constructor();
-    style: Record<string, any>;
+    _style: Record<string, any>;
+    get style(): string;
+    set style(value: string);
     classList: {
         toggle: (item: any, force: any) => void;
     };

package/dist/node/utils/tree-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-adapter.d.ts","sourceRoot":"","sources":["../../../lib/node/utils/tree-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree-adapter.d.ts","sourceRoot":"","sources":["../../../lib/node/utils/tree-adapter.ts"],"names":[],"mappings":"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"}

package/dist/router/index.js

@@ -165,7 +165,7 @@ var Router = class {
     const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
     this.query = parseQuery(parts[1]);
-    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1"));
+    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1").split("#")[0]);
     let component = await searchComponent(this, middlewares);
     if (component === false) {
       return;

package/dist/router/index.mjs

@@ -148,7 +148,7 @@ var Router = class {
     const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
     this.query = parseQuery(parts[1]);
-    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1"));
+    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1").split("#")[0]);
     let component = await searchComponent(this, middlewares);
     if (component === false) {
       return;

package/lib/node/utils/tree-adapter.ts

@@ -283,7 +283,7 @@ export class Element extends Node {
     this.childNodes = [];
   }
 
-  style = new Proxy(
+  _style = new Proxy(
     {},
     {
       get: (state: Record<string, any>, prop: string) => state[prop],
@@ -300,6 +300,26 @@ export class Element extends Node {
     }
   );
 
+  get style() {
+    return this._style as any;
+  }
+
+  set style(value: string) {
+    if (typeof value === "string") {
+      // should match pairs like "color: red; font-size: 12px; background: url(http://example.com/image.png?s=1024x1024&amp;w=is&amp;k=20&amp;c=ASa_AG8uP5Di7azXgJraSA6ME7fbLB0GX4YT_OzCARI=);"
+      const regex = /([^:\s]+):\s*((url\([^)]+\))|[^;]+(?=(;|$)))/g;
+      let match;
+
+      while ((match = regex.exec(value)) !== null) {
+        this._style[match[1]] = match[2].trim();
+      }
+
+      return;
+    }
+
+    throw new Error("Cannot set style");
+  }
+
   classList = {
     toggle: (item: any, force: any) => {
       if (item) {
@@ -342,6 +362,7 @@ export class Element extends Node {
   get innerHTML() {
     let str = "";
     for (let i = 0, l = this.childNodes.length; i < l; i++) {
+      // console.log("domToHtml", this.childNodes[i], domToHtml(this.childNodes[i] as Element));
       str += domToHtml(this.childNodes[i] as Element);
     }
     return str;
@@ -679,10 +700,10 @@ function getObjectIndexTree(html: string): DocumentFragment {
 
     if (attributesWithValues) {
       for (let attribute of attributesWithValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value.replace(/(^"|"$)/g, "");
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }
@@ -690,10 +711,10 @@ function getObjectIndexTree(html: string): DocumentFragment {
     let attributesWithBooleanValues = string.match(/\s\S+=[^"]+/g);
     if (attributesWithBooleanValues) {
       for (let attribute of attributesWithBooleanValues) {
-        const [name, value] = attribute.trim().split("=");
+        const [name, ...value] = attribute.trim().split("=");
         string = string.replace(attribute, "");
         if (value) {
-          element.attributes[name] = value;
+          element.attributes[name] = value.join("=").replace(/(^"|"$)/g, "");
         }
       }
     }

package/lib/router/index.ts

@@ -270,7 +270,7 @@ export class Router implements RouterInterface {
     this.url = constructedPath;
     this.query = parseQuery(parts[1]);
 
-    const middlewares = searchMiddlewares(this as RouterInterface, parts[0].replace(/(.+)\/$/, "$1"));
+    const middlewares = searchMiddlewares(this as RouterInterface, parts[0].replace(/(.+)\/$/, "$1").split("#")[0]);
     let component = await searchComponent(this as RouterInterface, middlewares);
 
     if (component === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valyrian.js",
-  "version": "7.2.5",
+  "version": "7.2.7",
   "description": "Lightweight steel to forge PWAs. (Minimal Frontend Framework with server side rendering and other capabilities)",
   "repository": "git@github.com:Masquerade-Circus/valyrian.js.git",
   "author": "Masquerade <christian@masquerade-circus.net>",