fix: enhance path handling in initElements and improve data assignment logic in setData

Author: frankpagan

src/fetchSrc.js

@@ -41,15 +41,18 @@ async function initElements(elements) {
 
 				let text = await response.text();
 				if (text) {
+					let path = "";
 					let pathElement = element.closest("[path]");
 					if (pathElement) {
-						let path =
-							pathElement.getAttribute("path") || getPath();
-						if (path) {
-							text = text.replaceAll(/\$relativePath\/?/g, path);
-						}
+						path = pathElement.getAttribute("path") || getPath();
+					} else {
+						path = getPath();
 					}
-
+					// Replace $relativePath in the fetched text
+					if (path) {
+						text = text.replaceAll(/\$relativePath\/?/g, path);
+					}
+					// Replace ObjectId() with a new ObjectId
 					text = text.replaceAll("ObjectId()", () => {
 						// Generate a NEW ObjectId inside the function
 						return ObjectId().toString(); // Return its string representation

src/index.js

@@ -400,6 +400,10 @@ async function setData(element, data) {
 		if (action && ["database", "array", "object", "key"].includes(action))
 			continue;
 
+		if (data.array.includes("aiConversations")) {
+			console.log("testing ai conversations");
+		}
+
 		const { key, isRead, isUpdate, isListen, isCrdt } = getAttributes(el);
 		let elementType = el.getAttribute("type");
 		if (elementType !== "file" && (el.getFilter || el.renderValue))
@@ -424,6 +428,14 @@ async function setData(element, data) {
 					if ($update) {
 						delete data[type][0].$update;
 						data[type][0] = { ...data[type][0], ...$update };
+					} else if (key === "$data") {
+						value = data;
+					} else if (key.startsWith("$data")) {
+						value = CRUD.getValueFromObject(data, key.slice(1));
+					} else if (key === `$${type}`) {
+						value = data[type];
+					} else if (key.startsWith(`$${type}`)) {
+						value = CRUD.getValueFromObject(data, key.slice(1));
 					} else if (key === "{}") {
 						value = data[type][0];
 						if (reference === "false") {
@@ -548,8 +560,21 @@ async function filterData(element, data, type, key) {
 			key.replace(/\.\$length$/, "")
 		);
 		element.setValue(value.length);
+	} else if (key === "$data") {
+		value = data;
+	} else if (key.startsWith("$data")) {
+		value = CRUD.getValueFromObject(data, key.slice(1));
+	} else if (key === `$${type}`) {
+		value = data[type];
+	} else if (key.startsWith(`$${type}`)) {
+		value = CRUD.getValueFromObject(data, key.slice(1));
 	} else if (key === "{}") {
-		element.setValue(data[type]);
+		value = data[type][0];
+		// if (reference === "false") {
+		// 	delete data[type][0].$storage;
+		// 	delete data[type][0].$database;
+		// 	delete data[type][0].$array;
+		// }
 	} else if (data) element.setValue(data);
 
 	if (data.$filter) {