@cocreate/render 1.53.0 → 2.0.1

package/src/{index.js → client/index.js}

@@ -18,7 +18,7 @@
 // Commercial Licensing Information:
 // For commercial use of this software without the copyleft provisions of the AGPLv3,
 // you must obtain a commercial license from CoCreate LLC.
-// For details, visit <https://cocreate.app/licenses/> or contact us at sales@cocreate.app.
+// For details, visit <https://CoCreateJS.com/licenses/> or contact us at sales@CoCreateJS.com.
 
 /*globals CustomEvent*/
 import Actions from "@cocreate/actions";
@@ -28,13 +28,23 @@ import {
     getValueFromObject,
     dotNotationToObject,
     ObjectId,
-    astAsync,
+    renderValue as renderValueUtility,
     uuid
 } from "@cocreate/utils";
 import "@cocreate/element-prototype";
 import "./index.css";
 
+/**
+ *
+ * @public
+ * @environment client
+ */
 const sources = new Map();
+/**
+ *
+ * @public
+ * @environment client
+ */
 const renderedNodes = new Map();
 const elementSelector = "[render-query]";
 
@@ -91,6 +101,8 @@ function setRenderContext(renderedNode, context = {}) {
  * - If an HTMLCollection or an array of elements is provided, each element in the collection/array is initialized.
  * - If a single element is provided, only that element is initialized.
  * - If null or omitted, the function queries and initializes all elements matching the 'elementSelector'.
+ * @private
+ * @environment client
  */
 function init(element) {
     if (
@@ -142,6 +154,8 @@ function init(element) {
  * @param {number} [options.currentIndex] - The current index in a list or array rendering process.
  * @param {boolean} [options.update] - Flag to indicate if the rendering should update existing content.
  * @param {boolean} [options.remove] - Flag to indicate if the rendering should remove elements instead of updating or appending.
+ * @public
+ * @environment client
  */
 async function render({
     source,
@@ -238,6 +252,8 @@ async function render({
         element = [element];
     }
 
+    const renderedNodesToClear = new Set();
+
     for (let i = 0; i < element.length; i++) {
         let renderedNode = renderedNodes.get(element[i]);
         if (renderedNode) {
@@ -259,6 +275,7 @@ async function render({
             };
             renderedNodes.set(element[i], renderedNode);
         }
+        renderedNodesToClear.add(renderedNode);
 
         let clones = renderedNode.clones; // || renderedNode.template.clones..
         if (!clones && renderedNode.template) {
@@ -333,6 +350,10 @@ async function render({
             await renderValues(element[i], data, key, renderAs);
         }
     }
+    for (const renderedNode of renderedNodesToClear) {
+        clearRendering(renderedNode);
+    }
+
     // Dispatch input and change events after rendering is complete
     if (source instanceof HTMLElement) {
         source.dispatchEvent(new Event("input"));
@@ -679,9 +700,11 @@ function insertElement(
         if (!template.clones) template = template.template;
 
         let item;
+        let isNewClone = false;
         if (!currentIndex && currentIndex !== 0) {
             if (template.clones.has(eid)) return;
             item = [eid, element];
+            isNewClone = true;
         }
 
         const clones = Array.from(template.clones);
@@ -694,6 +717,8 @@ function insertElement(
             index += data.filter.startingIndex;
         clones.splice(index, 0, item); // Insert item into clones at the specified index
 
+        if (isNewClone) trackRendering(template, element);
+
         if (renderReverse != null && renderReverse !== false && renderReverse !== "false") {
             // Chat-specific logic: reverse rendering but still inserting based on sorting
             if (clones[index + 1] && clones[index + 1][1] !== element) {
@@ -719,11 +744,32 @@ function insertElement(
 
         template.clones = new Map(clones);
     } else {
+        const isNewClone = !template.clones.has(eid);
+        if (isNewClone) trackRendering(template, element);
         template.clones.set(eid, element);
         template.element.insertAdjacentElement("beforebegin", element);
     }
 }
 
+function trackRendering(renderedNode, element) {
+    element.classList.add("render-pending");
+    if (!renderedNode.rendering) renderedNode.rendering = [];
+    renderedNode.rendering.push(element);
+}
+
+function clearRendering(renderedNode) {
+    if (!renderedNode?.rendering) return;
+
+    const elements = renderedNode.rendering;
+    delete renderedNode.rendering;
+
+    setTimeout(() => {
+        for (const element of elements) {
+            element.classList.remove("render-pending");
+        }
+    }, 300);
+}
+
 async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
     if (!data) return;
 
@@ -860,6 +906,7 @@ async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
             await renderTemplate(node, data, renderKey);
         } else if (node.childNodes.length > 0) {
             for (let childNode of Array.from(node.childNodes)) {
+                if (childNode.parentNode !== node) continue;
                 await renderValues(
                     childNode,
                     data,
@@ -871,7 +918,7 @@ async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
                 );
             }
         }
-    } else if (node.nodeType == 3) {
+    } else if (node.nodeType == 3 || (node.nodeType == 8 && renderedNode.htmlEnd)) {
         let valueType = node.parentElement.getAttribute("value-type");
 
         let textContent, text;
@@ -895,35 +942,34 @@ async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
             if (text != renderedNode.text) {
                 renderedNode.text = text;
 
-                if (
-                    valueType == "text" ||
-                    valueType == "string" ||
-                    valueType != "html"
-                ) {
-                    node.textContent = text;
-                } else {
-                    const newNode = document.createElement("div");
-                    newNode.innerHTML = text;
-                    let parentElement = node.parentElement;
-
-                    let renderedParent = renderedNodes.get(parentElement);
-                    if (!renderedParent) {
-                        renderedParent = {
-                            placeholder: textContent,
-                            key,
-                            renderAs
-                        };
-                    }
-                    renderedParent.text = text;
-                    for (let newChild of newNode.childNodes) {
-                        renderedNodes.set(newChild, {
+                if (valueType !== "html" && !renderedNode.htmlEnd) {
+                    node.textContent = text;
+                } else {
+                    const content = document.createElement("div");
+                    if (valueType === "html") content.innerHTML = text;
+                    else content.textContent = text;
+
+                    if (renderedNode.htmlEnd) {
+                        // Replace this binding's output while retaining its original template.
+                        let child = node.nextSibling;
+                        while (child && child !== renderedNode.htmlEnd) {
+                            const next = child.nextSibling;
+                            child.remove();
+                            child = next;
+                        }
+                        renderedNode.htmlEnd.before(...content.childNodes);
+                    } else {
+                        const start = document.createComment("render");
+                        const end = document.createComment("/render");
+                        renderedNodes.set(start, {
                             ...renderedNode,
-                            element: newChild
+                            element: start,
+                            htmlEnd: end
                         });
+                        renderedNodes.delete(node);
+                        node.replaceWith(start, ...content.childNodes, end);
                     }
-                    renderedNodes.delete(node);
-                    node.replaceWith(...newNode.childNodes);
-                }
+                }
 
                 if (node.childNodes.length > 0) {
                     for (let childNode of node.childNodes) {
@@ -945,7 +991,7 @@ async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
 
 /**
  * Renders placeholders within a string using asynchronous AST calculations and data context binding.
- * 
+ *
  * @param {Node} node - The target DOM node (attributes, text nodes, elements).
  * @param {Object} data - The contextual database record or dataset being rendered.
  * @param {string} placeholder - The raw template string containing double curly braces (e.g. "{{ $query('#input').value }}").
@@ -953,127 +999,21 @@ async function renderValues(node, data, key, renderAs, keyPath, parent, index) {
  * @param {HTMLElement} renderedNode - Optional target element where rendering applies.
  * @param {number} index - Optional current iteration index if rendering a list.
  * @returns {Promise<string>} - A promise resolving to the fully processed output string.
+ * @public
+ * @environment client
  */
-async function renderValue(
-    node,
-    data,
-    placeholder,
-    renderAs,
-    renderedNode,
-    index
-) {
-    let output = placeholder;
-
-    // Determine the actual HTMLElement for astAsync
-    // If the node is not an Element (nodeType 1), get its owner or parent element.
-    // This safely covers Attributes (ownerElement), Text, Comments, etc. (parentElement)
-    let contextElement = node;
-    if (node && node.nodeType !== 1) {
-        contextElement = node.ownerElement || node.parentElement;
-    }
-
-    // Matches ONLY the innermost {{ }} brackets to prevent greedy-matching nested boundaries.
-    let regex = /\{\{\s*((?:(?!\{\{|\}\})[\s\S])+?)\s*\}\}/;
-    let omitted = {};
-
-    let match;
-    do {
-        match = output.match(regex);
-        if (match) {
-            let value;
-            let placeholderContent = match[1].trim();
-
-            try {
-                if (placeholderContent === "index" && index >= 0) {
-                    value = index;
-                } else {
-                    // --- UNIFIED PARSING PROCESS ---
-                    let preProcessed = placeholderContent;
-
-                    // Build unified evaluation sandbox inheriting state & local indices
-                    const sandboxContext = {
-                        data: data,
-                        $data: data,
-                        index: index,
-                        $index: index,
-                        ...data // Expose data fields natively so they are available as local sandbox variables
-                    };
-
-                    // 1. PRE-PROCESSOR FOR QUOTED OPERATORS (Saves and processes quoted formulas first)
-                    let quoteRegex = /(['"])(.*?)\1/g;
-                    let quoteMatch;
-                    let replacements = [];
-                    while ((quoteMatch = quoteRegex.exec(preProcessed)) !== null) {
-                        let quoteType = quoteMatch[1];
-                        let content = quoteMatch[2];
-                        if (content.trim().startsWith('\u0024')) {
-                            let resolved = await astAsync({
-                                executeAST: content,
-                                node: contextElement,
-                                sandbox: sandboxContext
-                            });
-                            if (resolved === null || resolved === undefined) resolved = "";
-                            replacements.push({
-                                original: quoteMatch[0],
-                                replacement: `${quoteType}${resolved}${quoteType}`
-                            });
-                        }
-                    }
-
-                    for (let r of replacements) {
-                        preProcessed = preProcessed.replace(r.original, r.replacement);
-                    }
-
-                    // 2. PRE-PROCESSOR: Resolve unquoted DOM selectors, custom operators, and CRUD JSON formulas
-                    preProcessed = await astAsync({
-                        executeAST: preProcessed,
-                        node: contextElement,
-                        sandbox: sandboxContext
-                    });
-
-                    // 3. DATA LOOKUP: Resolve simple keys from the provided data object
-                    // Keep `node` here because getRenderValue needs to look up the attribute cache!
-                    value = getRenderValue(
-                        node,
-                        data,
-                        preProcessed,
-                        renderAs,
-                        index
-                    );
-                }
-            } catch (error) {
-                console.error("[Renderer AST Bridge] Value computation error:", error);
-            }
-
-            // Replace the placeholder with the resolved value
-            if (value !== undefined && value !== null) {
-                if (typeof value === "object") {
-                    value = JSON.stringify(value, null, 2);
-                }
-                output = output.replaceAll(match[0], value);
-            } else if (renderAs) {
-                if (match[0].startsWith(`{{${renderAs}.`)) {
-                    output = output.replaceAll(match[0], "");
-                } else if (placeholderContent) {
-                    output = output.replaceAll(
-                        match[0],
-                        `<|${placeholderContent}|>`
-                    );
-                    omitted[`<|${placeholderContent}|>`] = match[0];
-                }
-            } else {
-                match = null;
-            }
-        }
-    } while (match);
-
-    for (let key of Object.keys(omitted)) {
-        output = output.replaceAll(key, omitted[key]);
-    }
-
-    return output;
+async function renderValue(node, data, placeholder, renderAs, renderedNode, index) {
+    return renderValueUtility(
+        node,
+        data,
+        placeholder,
+        renderAs,
+        renderedNode,
+        index,
+        getRenderValue
+    );
 }
-
+
 function getRenderValue(node, data, key, renderAs, renderIndex) {
     let operator;
     if (key.startsWith("$")) {
@@ -1340,3 +1280,167 @@ Observer.init({
 init();
 
 export { render, renderValue, sources, renderedNodes };
+
+/**
+ *
+ * @name array
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name eid
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name key
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-as
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-clone
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-data
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-exclude
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-include
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-limit
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-query
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-reference
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-reverse
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name render-type
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name renderedKey
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name template
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ *
+ * @name value-type
+ * @kind attribute
+ * @environment client
+ */
+
+/**
+ * A simple render component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.
+ *
+ * @module render
+ * @environment client
+ */
+
+/**
+ * Declarative selectors recognized by this module.
+ *
+ * @name declarative-selectors
+ * @kind member
+ * @selectors
+ * @environment client
+ * @example
+ * ```json
+ * [
+ *   "[${params}]",
+ *   "[render-element]",
+ *   "[render-clone]",
+ *   "[render-query]"
+ * ]
+ * ```
+ */
+
+/**
+ * Declarative actions supported or registered by this module.
+ *
+ * @name declarative-actions
+ * @kind member
+ * @actions
+ * @environment client
+ * @example
+ * ```json
+ * [
+ *   {
+ *     "name": "render"
+ *   },
+ *   {
+ *     "name": "renderKey"
+ *   }
+ * ]
+ * ```
+ */

package/src/client/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}