@web-atoms/web-controls 2.3.98 → 2.3.100

package/src/basic/AtomRepeater.tsx

@@ -16,6 +16,7 @@ import ArrayLike from "../ArrayLike";
 import InlinePopup from "./InlinePopup";
 import InlinePopupControl from "./InlinePopupControl";
 import MergeNode from "./MergeNode";
+import ItemPath from "./ItemPath";
 
 CSS(StyleRule()
     .display("none")
@@ -1238,38 +1239,9 @@ export default class AtomRepeater<T = any> extends AtomControl {
         let index = ~~itemIndex;
         const item = this.items[index];
         if (item) {
-            if (itemPath) {
+            if (itemPath ?? false) {
                 // check path...
-
-                if (/^[\{\"}]/.test(itemPath)) {
-                    this.dispatchItemEvent(clickEvent, item, recreate, e.target, JSON.parse(itemPath));
-                    return;
-                }
-
-                let nestedItem = {};
-                const all: string[] = itemPath.split(",");
-                for (const iterator of all) {
-                    let [name, paths] = iterator.split(/\=|\:/);
-                    if (paths === void 0) {
-                        if (all.length > 1) {
-                            throw new Error("Invalid path, please use name=path format");
-                        }
-                        paths = name;
-                    }
-                    let start = item;
-                    for (const path of paths.split(".")) {
-                        if (path === "$") {
-                            start = item;
-                            continue;
-                        }
-                        start = start[path];
-                    }
-                    if (all.length === 1) {
-                        nestedItem = start;
-                        break;
-                    }
-                    nestedItem[name] = start;
-                }
+                const nestedItem = ItemPath.get(item, itemPath.trim());
                 this.dispatchItemEvent(clickEvent, item, recreate, e.target, nestedItem);
                 return;
             }

package/src/basic/ItemPath.ts

@@ -0,0 +1,87 @@
+const get = (start, path: string) => {
+    let item = start;
+    for (const iterator of path.split(".")) {
+        if (iterator === "$") {
+            item = start;
+        }
+        item = item[iterator];
+    }
+    return item;
+}
+
+function* getFragments(path: string) {
+    const regex = /([^\=\:]+)\s*[\=\:]\s*((('[^\\']*(((\\')|(''))[^\\']*)*')|("[^\\"]*(((\\")|(""))[^\\"]*)*"))|([^\,\;]+))\s*[\,\;]?\s*/gmi;
+
+    // Alternative syntax using RegExp constructor
+    // const regex = new RegExp('(([^\\=\\:]+)\\s*[\\=\\:]\\s*(([^\\,]+)|(\'[^\\\\\']*(((\\\\\')|(\'\'))[^\\\\\']*)*\')|("[^\\\\"]*(((\\\\")|(""))[^\\\\"]*)*")))[\\,\\;]?\\s*', 'gmi')
+
+    let m;
+
+    while ((m = regex.exec(path)) !== null) {
+        // This is necessary to avoid infinite loops with zero-width matches
+        if (m.index === regex.lastIndex) {
+            regex.lastIndex++;
+        }
+
+        yield [m[1].trim(), m[2].trim()]
+    
+    }
+}
+
+export default class ItemPath {
+
+    public static get(item, path: string) {
+        if (path.startsWith("$.")) {
+            return get(item, path);
+        }
+        if (/^[\{\"]/.test(path)) {
+            // it is a valid json..
+            const json = JSON.parse(path);
+
+            // should we have some sort of json embedding??
+
+            return json;
+        }
+        const target = {};
+        this.build(item, path, target);
+        return target;
+    }
+
+    public static build(item, path: string, target: any) {
+        for (let [key, value] of getFragments(path)) {
+            if (value.startsWith("$")) {
+                value = get(item, value);
+                target[key] = value;
+                continue;
+            }
+            if (value.startsWith('"')) {
+                value = JSON.parse(value);
+                target[key] = value;
+                continue;
+            }
+            if (value.startsWith("'")) {
+                value = value.substring(1, value.length - 1);
+                value = value.replace(/((\'\')|(\\\'))/, "'");
+                target[key] = value;
+                continue;
+            }
+
+            // these values are purposely compared
+            // at end because they will be used rarly
+            if (value === "true") {
+                target[key] = true;
+                continue;
+            }
+            if (value === "false") {
+                target[key] = false;
+                continue;
+            }
+            if (value === "null") {
+                target[key] = null;
+                continue;
+            }
+            target[key] = Number(value);
+        }
+    }
+
+}