taggedjs 2.5.24 → 2.6.2

package/js/interpolations/optimizers/htmlInterpolationToDomMeta.function.js

@@ -1,26 +1,23 @@
-import { variableSuffix, variablePrefix } from "../../tag/Tag.class.js";
-import { replacePlaceholders } from "./replacePlaceholders.function.js";
-import { restorePlaceholders } from "./restorePlaceholders.function.js";
+import { variablePrefix, variableSuffix } from "../../tag/Tag.class.js";
+import { isSpecialAttr } from "../attributes/isSpecialAttribute.function.js";
+const ondoubleclick = 'ondoubleclick';
+const fragFindAny = /(:tagvar\d+:)/;
 const fragReplacer = /(^:tagvar\d+:|:tagvar\d+:$)/g;
 const safeVar = '__safeTagVar';
-const regexAttr = /([:_a-zA-Z0-9\-\.]+)(?:="([^"]*)"|=(\S+))?/g;
-const regexTagOrg = /<\/?([a-zA-Z0-9\-]+)([^>]*)>/;
+const regexAttr = /([:_a-zA-Z0-9\-\.]+)\s*(?:=\s*"([^"]*)"|=\s*(\S+))?/g;
+const regexTagOrg = /<\/?([a-zA-Z0-9\-]+)((?:\s+[a-zA-Z_:][\w:.\-]*(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?)+\s*|\s*)\/?>/g;
 export function htmlInterpolationToDomMeta(strings, values) {
+    htmlInterpolationToPlaceholders(strings, values);
+    // Parse the modified fragments
+    const htmlString = htmlInterpolationToPlaceholders(strings, values).join('');
+    const domMeta = parseHTML(htmlString);
+    return domMeta;
+}
+export function htmlInterpolationToPlaceholders(strings, values) {
     // Sanitize placeholders in the fragments
     const sanitizedFragments = sanitizePlaceholders(strings);
     // Add placeholders to the fragments
-    const fragmentsWithPlaceholders = addPlaceholders(sanitizedFragments, values);
-    // Parse the modified fragments
-    const htmlString = fragmentsWithPlaceholders.join('');
-    const parsedElements = parseHTML(htmlString);
-    return parsedElements;
-}
-export function exchangeParsedForValues(parsedElements, values) {
-    // Replace placeholders with actual dynamic values
-    replacePlaceholders(parsedElements, values);
-    // Restore any sanitized placeholders in text nodes
-    restorePlaceholders(parsedElements);
-    return parsedElements;
+    return addPlaceholders(sanitizedFragments, values);
 }
 function sanitizePlaceholders(fragments) {
     return fragments.map(fragment => fragment.replace(fragReplacer, (match, index) => safeVar + index));
@@ -35,13 +32,15 @@ function addPlaceholders(strings, values) {
     balanceArrayByArrays(results, strings, values);
     return results;
 }
-function parseHTML(html) {
+export function parseHTML(html) {
+    const valuePositions = [];
     const elements = [];
     const stack = [];
     let currentElement = null;
-    let valueIndex = 0;
+    let valueIndex = -1;
     let position = 0;
     const regexTag = new RegExp(regexTagOrg, 'g');
+    html = preprocessTagsInComments(html);
     while (position < html.length) {
         const tagMatch = regexTag.exec(html);
         if (!tagMatch) {
@@ -53,19 +52,13 @@ function parseHTML(html) {
         if (position < tagMatch.index) {
             const textContent = html.slice(position, tagMatch.index);
             if (textContent.trim()) {
-                const textNode = {
-                    nodeName: 'text',
-                    textContent // : textContent.trim() ??? new removed
-                };
-                if (currentElement) {
-                    if (!currentElement.children) {
-                        currentElement.children = [];
+                const textVarMatches = splitByTagVar(textContent);
+                textVarMatches.forEach(textContent => {
+                    if (textContent.startsWith(variablePrefix)) {
+                        textContent = variablePrefix + (++valueIndex) + variableSuffix;
                     }
-                    currentElement.children.push(textNode);
-                }
-                else {
-                    elements.push(textNode);
-                }
+                    pushTextTo(currentElement, elements, textContent);
+                });
             }
         }
         position = tagMatch.index + fullMatch.length;
@@ -73,29 +66,57 @@ function parseHTML(html) {
             currentElement = stack.pop() || null;
             continue;
         }
-        const element = {
-            nodeName: tagName,
-            attributes: []
-        };
+        const attributes = [];
         let attrMatch;
         while ((attrMatch = regexAttr.exec(attrString)) !== null) {
-            let [_, attrName, attrValueQuoted, attrValueUnquoted] = attrMatch;
-            let attrValue = attrValueQuoted || attrValueUnquoted;
-            if (attrValue === undefined) {
+            const attrName = attrMatch[1] || attrMatch[3] || attrMatch[5];
+            const attrChoice = attrMatch[2] || attrMatch[4] || attrMatch[6];
+            let attrValue = attrChoice;
+            if (attrName === undefined) {
+                continue;
+            }
+            const notEmpty = attrMatch[2] !== '';
+            const noValue = attrValue === undefined && notEmpty;
+            const lowerName = attrName.toLowerCase();
+            const fixedName = lowerName.startsWith('on') ? cleanEventName(lowerName) : lowerName;
+            if (noValue) {
                 const standAloneVar = attrName.slice(0, variablePrefix.length) === variablePrefix;
                 if (standAloneVar) {
-                    element.attributes.push([attrName]); // the name itself is dynamic
+                    const valueName = variablePrefix + (++valueIndex) + variableSuffix;
+                    valuePositions.push(['at', valueName]);
+                    attributes.push([valueName]); // the name itself is dynamic
+                    continue;
+                }
+                const startMatched = attrMatch[0].startsWith(attrName);
+                const standAloneAttr = startMatched && attrMatch[0].slice(attrName.length, attrMatch[0].length).search(/\s+$/) >= 0;
+                if (standAloneAttr) {
+                    attributes.push([fixedName]);
                     continue;
                 }
-                attrValue = variablePrefix + (valueIndex++) + variableSuffix;
+                const valueName = variablePrefix + (++valueIndex) + variableSuffix;
+                attrValue = valueName;
+            }
+            if (!notEmpty) {
+                attrValue = attrMatch[2];
             }
-            element.attributes.push([attrName.toLowerCase(), attrValue]);
+            const attrSet = [fixedName, attrValue];
+            const isSpecial = isSpecialAttr(fixedName);
+            if (isSpecial) {
+                attrSet.push(isSpecial);
+            }
+            attributes.push(attrSet);
+        }
+        const element = {
+            nn: tagName, // nodeName
+        };
+        if (attributes.length) {
+            element.at = attributes;
         }
         if (currentElement) {
-            if (!currentElement.children) {
-                currentElement.children = [];
+            if (!currentElement.ch) {
+                currentElement.ch = [];
             }
-            currentElement.children.push(element);
+            currentElement.ch.push(element);
         }
         else {
             elements.push(element);
@@ -108,19 +129,13 @@ function parseHTML(html) {
     if (position < html.length) {
         const textContent = html.slice(position);
         if (textContent.trim()) {
-            const textNode = {
-                nodeName: 'text',
-                textContent: textContent.trim()
-            };
-            if (currentElement) {
-                if (!currentElement.children) {
-                    currentElement.children = [];
+            const textVarMatches = splitByTagVar(textContent);
+            textVarMatches.forEach(textContent => {
+                if (textContent.startsWith(variablePrefix)) {
+                    ++valueIndex;
                 }
-                currentElement.children.push(textNode);
-            }
-            else {
-                elements.push(textNode);
-            }
+                return pushTextTo(currentElement, elements, textContent);
+            });
         }
     }
     return elements;
@@ -133,4 +148,54 @@ export function balanceArrayByArrays(results, strings, values) {
         }
     }
 }
+function splitByTagVar(inputString) {
+    // Split the string using the regular expression, keep delimiters in the output
+    const parts = inputString.split(fragFindAny);
+    // Filter out any empty strings from the results
+    const filteredParts = parts.filter(part => part !== '');
+    return filteredParts;
+}
+function pushTo(currentElement, elements, textNode) {
+    if (currentElement) {
+        if (!currentElement.ch) {
+            currentElement.ch = [];
+        }
+        currentElement.ch.push(textNode);
+    }
+    else {
+        elements.push(textNode);
+    }
+}
+function pushTextTo(currentElement, elements, textContent) {
+    const textNode = {
+        nn: 'text', // nodeName
+        tc: postprocessTagsInComments(textContent), // textContent
+    };
+    pushTo(currentElement, elements, textNode);
+}
+const removeCommentRegX = new RegExp('(<!--[\\s\\S]*?-->)', 'g');
+function preprocessTagsInComments(html) {
+    // Use a regex to find all HTML comments
+    return html.replace(removeCommentRegX, function (match) {
+        // For each comment found, replace < and > inside it
+        return match.replace(/\[l t\]/g, '[l&nbsp;t]').replace(/\[g t\]/g, '[g&nbsp;t]').replace(/</g, '[l t]').replace(/>/g, '[g t]');
+    });
+}
+function postprocessTagsInComments(html) {
+    // Use a regex to find all segments that look like processed comments
+    return html.replace(/(\[l t\]!--[\s\S]*?--\[g t\])/g, function (match) {
+        // For each processed comment found, replace *lt* and *gt* back to < and >
+        return match.replace(/\[l t\]/g, '<').replace(/\[g t\]/g, '>').replace(/\[l&nbsp;t\]/g, '[l t]').replace(/\[g&nbsp;t\]/g, '[g t]');
+    });
+}
+function cleanEventName(eventName) {
+    if (eventName.startsWith('on')) {
+        const couldByDblClick = eventName.length === ondoubleclick.length && eventName === ondoubleclick;
+        if (couldByDblClick) {
+            return 'dblclick';
+        }
+        return eventName.slice(2, eventName.length);
+    }
+    return eventName;
+}
 //# sourceMappingURL=htmlInterpolationToDomMeta.function.js.map

package/js/interpolations/optimizers/htmlInterpolationToDomMeta.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"htmlInterpolationToDomMeta.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/htmlInterpolationToDomMeta.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,MAAM,YAAY,GAAG,8BAA8B,CAAA;AACnD,MAAM,OAAO,GAAG,cAAc,CAAA;AAC9B,MAAM,SAAS,GAAG,6CAA6C,CAAC;AAChE,MAAM,WAAW,GAAG,8BAA8B,CAAA;AAElD,MAAM,UAAU,0BAA0B,CACxC,OAAiB,EACjB,MAAiB;IAEjB,yCAAyC;IACzC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAExD,oCAAoC;IACpC,MAAM,yBAAyB,GAAG,eAAe,CAC/C,kBAAkB,EAAE,MAAM,CAC3B,CAAA;IAED,+BAA+B;IAC/B,MAAM,UAAU,GAAG,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;IAE5C,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,cAA8C,EAC9C,MAAiB;IAEjB,kDAAkD;IAClD,mBAAmB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IAE3C,mDAAmD;IACnD,mBAAmB,CAAC,cAAc,CAAC,CAAA;IAEnC,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAmB;IAC/C,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAC9B,QAAQ,CAAC,OAAO,CAAC,YAAY,EAC7B,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,CAAC,CACnC,CAAA;AACH,CAAC;AAED,SAAS,eAAe,CACtB,OAAiB,EACjB,MAAa;IAGb,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC9C,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO,QAAQ,GAAG,cAAc,GAAG,KAAK,GAAG,cAAc,CAAA;QAC3D,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAA;IAEF,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAE9C,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,QAAQ,GAAsC,EAAE,CAAC;IACvD,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,IAAI,cAAc,GAAyB,IAAI,CAAC;IAChD,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;IAE7C,OAAO,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM;QACR,CAAC;QAED,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC;QAClD,MAAM,YAAY,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,QAAQ,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAe;oBAC3B,QAAQ,EAAE,MAAM;oBAChB,WAAW,CAAC,uCAAuC;iBACpD,CAAA;gBAED,IAAI,cAAc,EAAE,CAAC;oBACnB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;wBAC7B,cAAc,CAAC,QAAQ,GAAG,EAAE,CAAC;oBAC/B,CAAC;oBACD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;QAED,QAAQ,GAAG,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;QAE7C,IAAI,YAAY,EAAE,CAAC;YACjB,cAAc,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC;YACrC,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAkB;YAC7B,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,EAAqB;SAClC,CAAC;QAEF,IAAI,SAAS,CAAC;QACd,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,CAAC,GAAG,SAAS,CAAC;YAClE,IAAI,SAAS,GAAG,eAAe,IAAI,iBAAiB,CAAC;YACrD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,cAAc,CAAA;gBAEjF,IAAG,aAAa,EAAE,CAAC;oBACjB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA,CAAC,6BAA6B;oBACjE,SAAQ;gBACV,CAAC;gBAED,SAAS,GAAG,cAAc,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,cAAc,CAAA;YAC9D,CAAC;YAED,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;QAC9D,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC7B,cAAc,CAAC,QAAQ,GAAG,EAAE,CAAC;YAC/B,CAAC;YACD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,OAA2B,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,KAAK,CAAC,IAAI,CAAC,cAA+B,CAAC,CAAC;YAC5C,cAAc,GAAG,OAAO,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAe;gBAC3B,QAAQ,EAAE,MAAM;gBAChB,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE;aAChC,CAAC;YACF,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;oBAC7B,cAAc,CAAC,QAAQ,GAAG,EAAE,CAAC;gBAC/B,CAAC;gBACD,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAAkB,EAClB,OAAiB,EACjB,MAAiB;IAEjB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC3C,IAAG,IAAI,GAAG,CAAC,EAAE,CAAC;QACZ,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAE,cAAc,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,CAAE,CAAA;QAC5E,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"htmlInterpolationToDomMeta.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/htmlInterpolationToDomMeta.function.ts"],"names":[],"mappings":"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"}

package/js/interpolations/optimizers/metaAttachDomElements.function.d.ts

@@ -1,6 +1,12 @@
 import { BaseSupport, Support } from "../../tag/Support.class.js";
 import { Context } from "../../tag/Tag.class.js";
 import { Counts } from "../interpolateTemplate.js";
-import { DomObjectChildren, ObjectChildren } from "./ObjectNode.types.js";
-export declare function attachDomElement(nodes: ObjectChildren, scope: Context, support: BaseSupport | Support, fragment: DocumentFragment, counts: Counts, // used for animation stagger computing
-owner: Element): DomObjectChildren;
+import { SubToTemplateOptions } from "../subscribeToTemplate.function.js";
+import { DomObjectChildren } from "./ObjectNode.types.js";
+import { ObjectChildren } from "./exchangeParsedForValues.function.js";
+export declare function attachDomElement(nodes: ObjectChildren, values: any[], support: BaseSupport | Support, counts: Counts, // used for animation stagger computing
+owner?: Element, subs?: SubToTemplateOptions[], context?: Context): {
+    context: Context;
+    subs: SubToTemplateOptions[];
+    dom: DomObjectChildren;
+};

package/js/interpolations/optimizers/metaAttachDomElements.function.js

@@ -1,43 +1,89 @@
-import { textNode } from "../../tag/textNode.js";
-import { processAttribute } from "../processAttribute.function.js";
-import { subscribeToTemplate } from "../subscribeToTemplate.function.js";
-export function attachDomElement(nodes, scope, support, fragment, counts, // used for animation stagger computing
-owner) {
-    nodes.forEach((node, index) => {
-        const marker = node.marker = textNode.cloneNode(false);
-        // marker.textContent = `_<${index}>_`
-        const subject = node.value;
-        if (subject) {
-            owner.appendChild(marker);
-            subject.global.placeholder = marker;
-            subscribeToTemplate(owner, marker, subject, support, // ownerSupport,
-            counts);
-            return;
+// taggedjs-no-compile
+import { isSubjectInstance } from "../../isInstance.js";
+import { paintAppends, paintInsertBefores } from "../../tag/paint.function.js";
+import { empty } from "../../tag/ValueTypes.enum.js";
+import { processAttribute } from "../attributes/processAttribute.function.js";
+import { processFirstSubjectValue } from "../../tag/update/processFirstSubjectValue.function.js";
+import { howToSetInputValue } from "../attributes/howToSetInputValue.function.js";
+import { getNewGlobal } from "../../tag/index.js";
+// ??? TODO: This could be done within exchangeParsedForValues to reduce loops
+export function attachDomElement(nodes, values, support, counts, // used for animation stagger computing
+owner, subs = [], context = []) {
+    const x = document.createElement('div');
+    const dom = [];
+    for (const node of nodes) {
+        const newNode = {}; // DomObjectText
+        dom.push(newNode);
+        const value = node.v;
+        const isNum = !isNaN(value);
+        const subVal = values[context.length];
+        if (isNum) {
+            const marker = document.createTextNode(empty);
+            const global = getNewGlobal();
+            const contextItem = {
+                global
+            };
+            context.push(contextItem);
+            global.placeholder = marker;
+            if (owner) {
+                paintAppends.push({
+                    relative: owner,
+                    element: marker,
+                });
+            }
+            else {
+                paintInsertBefores.push({
+                    element: marker,
+                    relative: support.subject.global.placeholder,
+                });
+            }
+            // newNode.marker = marker
+            // delete newNode.marker // delete so that the marker is not destroyed with tag
+            if (isSubjectInstance(subVal)) {
+                subs.push({
+                    // fragment: owner,
+                    insertBefore: marker,
+                    appendTo: owner,
+                    subject: subVal,
+                    support, // ownerSupport,
+                    counts,
+                    contextItem,
+                });
+                continue;
+            }
+            processFirstSubjectValue(subVal, contextItem, support, counts, owner);
+            continue;
         }
-        if (node.nodeName === 'text') {
-            const string = node.textContent;
-            // parse things like &nbsp;
-            const text = new DOMParser().parseFromString(string, 'text/html');
-            const openingSpace = string.replace(/(^\s+)?.+/g, '$1');
-            const newString = openingSpace + text.documentElement.textContent;
-            owner.appendChild(marker);
-            node.domElement = document.createTextNode(newString);
-            owner.appendChild(node.domElement);
-            return;
+        if (node.nn === 'text') {
+            const textNode = newNode;
+            const string = textNode.tc = node.tc;
+            x.innerHTML = string;
+            const domElement = textNode.domElement = document.createTextNode(x.innerText);
+            if (owner) {
+                paintAppends.push({
+                    element: domElement,
+                    relative: owner,
+                });
+            }
+            continue;
         }
-        node = node;
-        const domElement = node.domElement = document.createElement(node.nodeName);
-        owner.appendChild(domElement);
-        owner.appendChild(marker);
-        if (node.attributes) {
-            node.attributes.forEach(attr => {
-                processAttribute(attr, domElement, scope, support);
+        const domElement = newNode.domElement = document.createElement(node.nn);
+        // attributes that may effect style, come first
+        if (node.at) {
+            node.at.map(attr => processAttribute(attr[0], // name
+            domElement, support, howToSetInputValue, context, attr[1], // value
+            attr[2]));
+        }
+        if (owner) {
+            paintAppends.push({
+                element: domElement,
+                relative: owner,
             });
         }
-        if (node.children) {
-            attachDomElement(node.children, scope, support, fragment, counts, domElement);
+        if (node.ch) {
+            newNode.ch = attachDomElement(node.ch, values, support, counts, domElement, subs, context).dom;
         }
-    });
-    return nodes;
+    }
+    return { subs, dom, context };
 }
 //# sourceMappingURL=metaAttachDomElements.function.js.map

package/js/interpolations/optimizers/metaAttachDomElements.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"metaAttachDomElements.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/metaAttachDomElements.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAGxE,MAAM,UAAU,gBAAgB,CAC9B,KAAqB,EACrB,KAAc,EACd,OAA8B,EAC9B,QAA0B,EAC1B,MAAc,EAAE,uCAAuC;AACvD,KAAc;IAEd,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAS,CAAA;QAC9D,sCAAsC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,KAA0B,CAAA;QAE/C,IAAG,OAAO,EAAE,CAAC;YACX,KAAK,CAAC,WAAW,CAAE,MAAM,CAAE,CAAA;YAC3B,OAAO,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAA;YACnC,mBAAmB,CACjB,KAAY,EACZ,MAAM,EACN,OAAO,EACP,OAAO,EAAE,gBAAgB;YACzB,MAAM,CACP,CAAA;YACD,OAAM;QACR,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAI,IAAmB,CAAC,WAAW,CAAA;YAC/C,2BAA2B;YAC3B,MAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;YACjE,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,EAAC,IAAI,CAAC,CAAA;YACtD,MAAM,SAAS,GAAG,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,WAAqB,CAAA;YAC3E,KAAK,CAAC,WAAW,CAAE,MAAM,CAAE,CAAA;YAC3B,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;YACpD,KAAK,CAAC,WAAW,CAAE,IAAI,CAAC,UAAU,CAAE,CAAA;YACpC,OAAM;QACR,CAAC;QAED,IAAI,GAAG,IAAwB,CAAA;QAE/B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAE1E,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;QAC7B,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAEzB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC7B,gBAAgB,CACd,IAAI,EACJ,UAAU,EACV,KAAK,EACL,OAAO,CACR,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,gBAAgB,CACd,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAC5D,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,KAA0B,CAAA;AACnC,CAAC"}
+{"version":3,"file":"metaAttachDomElements.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/metaAttachDomElements.function.ts"],"names":[],"mappings":"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"}

package/js/interpolations/optimizers/replacePlaceholders.function.d.ts

@@ -1,2 +1,3 @@
-import { ObjectElement, ObjectText } from "./ObjectNode.types.js";
-export declare function replacePlaceholders(elements: (ObjectElement | ObjectText)[], values: unknown[]): void;
+import { ValuePos } from "./LikeObjectElement.type.js";
+import { ParsedHtml, UnparsedHtml } from "./types.js";
+export declare function replacePlaceholders(dom: UnparsedHtml, valueCount: number, valuePositions?: ValuePos[], currentTail?: (string | number)[]): ParsedHtml;

package/js/interpolations/optimizers/replacePlaceholders.function.js

@@ -1,92 +1,71 @@
+// taggedjs-no-compile
 import { variableSuffix, variablePrefix } from "../../tag/Tag.class.js";
-import { ValueTypes } from "../../tag/ValueTypes.enum.js";
-export function replacePlaceholders(elements, values) {
-    // const rtnElements: (ObjectElement | ObjectText)[] = []
+import { ImmutableTypes } from "../../tag/ValueTypes.enum.js";
+const placeholderRegex = new RegExp(variablePrefix + '(\\d+)' + variableSuffix, 'g');
+const at = 'at'; // short for attribute
+const ch = 'ch'; // short for children
+export function replacePlaceholders(dom, valueCount, valuePositions = [], currentTail = []) {
+    const elements = dom;
     for (let i = 0; i < elements.length; i++) {
+        const loopTail = [...currentTail, i];
         const element = elements[i];
-        // const element = {...elements[i]} // ???
-        // rtnElements.push(element)
-        // TODO: We most likely do not need to replace attributes
-        if ('attributes' in element) {
-            element.attributes = processAttributes(element.attributes, values);
+        if (element.at) {
+            const attrs = element.at;
+            element.at = processAttributes(attrs, valueCount);
         }
-        if ('children' in element) {
-            // const children = [...element.children as ObjectChildren];
-            const children = element.children;
-            replacePlaceholders(children, values);
-            element.children = children;
-            // Remove empty children array
-            if (element.children.length === 0) {
-                delete element.children;
-            }
+        if (element.ch) {
+            const children = element.ch;
+            const innerLoopTail = [...loopTail, ch];
+            element.ch = replacePlaceholders(children, valueCount, valuePositions, innerLoopTail);
         }
-        i = examineChild(element, values, elements, i);
+        i = examineChild(element, valueCount, elements, i);
     }
+    return elements;
 }
-function examineChild(child, values, children, index) {
-    if (child.nodeName !== 'text') {
+function examineChild(child, valueCount, children, index) {
+    if (child.nn !== 'text') {
         return index;
     }
     const textChild = child;
-    let textContent = textChild.textContent;
-    if (typeof textContent !== 'string') {
+    let textContent = textChild.tc;
+    if (typeof textContent !== ImmutableTypes.string) {
         return index;
     }
-    const placeholderRegex = new RegExp(variablePrefix + '(\\d+)' + variableSuffix, 'g');
     let match;
     while ((match = placeholderRegex.exec(textContent)) !== null) {
-        const wIndex = parseInt(match[1], 10);
-        const examine = !isNaN(wIndex) && wIndex < values.length;
+        const secondMatch = match[1];
+        const wIndex = parseInt(secondMatch, 10);
+        const examine = !isNaN(wIndex) && wIndex < valueCount;
         if (examine) {
             const varContent = variablePrefix + wIndex + variableSuffix;
-            const before = textContent.slice(0, match.index);
             const after = textContent.slice(match.index + varContent.length);
-            let value = values[wIndex];
-            if (value instanceof Array) {
-                value = value.map((x, index) => {
-                    if (x?.tagJsType === ValueTypes.dom) {
-                        const domClone = [...x.dom];
-                        const elements = replacePlaceholders(domClone, x.values);
-                        return domClone;
-                    }
-                    return x;
-                });
-            }
-            // TODO: I don't think we need three adds?
-            children.splice(index, 1, {
-                nodeName: 'text',
-                textContent: before
-            }, {
-                nodeName: 'text',
-                textContent: '',
-                value,
-            }, {
-                nodeName: 'text',
-                textContent: after
-            });
+            children.splice(index, 1, ...[{
+                    nn: 'text',
+                    v: wIndex
+                }]);
             textContent = after;
             placeholderRegex.lastIndex = 0; // Reset regex index due to split
-            index += 2; // Skip the newly inserted elements
         }
     }
-    textChild.textContent = textContent;
+    textChild.tc = textContent;
     return index;
 }
-function processAttributes(attributes, values) {
-    return attributes.map(([key, value]) => {
+function processAttributes(attributes, valueCount) {
+    return attributes.map(attrSet => {
+        const [key, value, isSpecial] = attrSet;
         if (key.startsWith(variablePrefix)) {
             const index = parseInt(key.replace(variablePrefix, ''), 10);
-            if (!isNaN(index) && index < values.length) {
-                return [values[index]]; // the name is the value
+            if (!isNaN(index) && index < valueCount) {
+                return [{ tagJsVar: index }];
             }
         }
-        if (typeof value === 'string' && value.startsWith(variablePrefix)) {
+        if (typeof value === ImmutableTypes.string && value.startsWith(variablePrefix)) {
             const index = parseInt(value.replace(variablePrefix, ''), 10);
-            if (!isNaN(index) && index < values.length) {
-                value = values[index];
+            if (!isNaN(index) && index < valueCount) {
+                return [key, { tagJsVar: index }, isSpecial];
             }
         }
-        return [key, value];
+        return attrSet;
     });
 }
 //# sourceMappingURL=replacePlaceholders.function.js.map

package/js/interpolations/optimizers/replacePlaceholders.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"replacePlaceholders.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/replacePlaceholders.function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"replacePlaceholders.function.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/replacePlaceholders.function.ts"],"names":[],"mappings":"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"}

package/js/interpolations/optimizers/restorePlaceholders.function.d.ts

@@ -1,3 +1,3 @@
-import { ObjectChildren } from "./ObjectNode.types.js";
+import { ObjectChildren } from "./LikeObjectElement.type.js";
 export declare const safeVar = "__safeTagVar";
 export declare function restorePlaceholders(elements: ObjectChildren): void;