taggedjs 2.1.2 → 2.3.25

package/js/js/interpolateAttributes.js

@@ -1,69 +1,127 @@
-import { Subject } from "./Subject.js";
 import { inputAttribute } from "./inputAttribute.js";
-const startRegX = /^\s*{/;
-const endRegX = /}\s*$/;
+import { isSubjectInstance } from "./isInstance.js";
 export function interpolateAttributes(child, scope, ownerTag) {
-    child.getAttributeNames().forEach(attrName => {
+    const attrNames = child.getAttributeNames();
+    const isTextArea = child.nodeName === 'TEXTAREA';
+    if (isTextArea && !attrNames.includes('value')) {
+        const value = child.getAttribute('textVarValue'); // (child as any).value
+        processAttribute('textVarValue', value, child, scope, ownerTag, (_name, value) => child.value = value);
+    }
+    const howToSet = (name, value) => child.setAttribute(name, value);
+    attrNames.forEach(attrName => {
         const value = child.getAttribute(attrName);
-        const isSpecial = isSpecialAttr(attrName);
-        // An attempt to replicate React
-        if (value && value.search(startRegX) >= 0 && value.search(endRegX) >= 0) {
-            // get the code inside the brackets like "variable0" or "{variable0}"
-            const code = value.replace('{', '').split('').reverse().join('').replace('}', '').split('').reverse().join('');
-            const result = scope[code];
-            // attach as callback
-            if (result instanceof Function) {
-                ;
-                child[attrName] = function (...args) {
-                    result(child, args);
-                };
-                return;
-            }
-            if (result instanceof Subject) {
-                child.removeAttribute(attrName);
-                const callback = (newAttrValue) => {
-                    if (newAttrValue instanceof Function) {
-                        ;
-                        child[attrName] = function (...args) {
-                            newAttrValue(child, args);
-                        };
-                        child[attrName].tagFunction = newAttrValue;
-                        return;
-                    }
-                    if (isSpecial) {
-                        inputAttribute(attrName, newAttrValue, child);
-                    }
-                    if (newAttrValue) {
-                        child.setAttribute(attrName, newAttrValue);
-                    }
-                    const isDeadValue = newAttrValue === undefined || newAttrValue === false || newAttrValue === null;
-                    if (isDeadValue) {
-                        child.removeAttribute(attrName);
-                        return;
-                    }
-                    // value is 0
-                    child.setAttribute(attrName, newAttrValue);
-                };
-                const sub = result.subscribe(callback);
-                ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
-                return;
-            }
-            // child.setAttribute(attrName, result)
-            /*
-            if(attrName === 'style') {
-              return
-            }
-            */
-            child.setAttribute(attrName, result.value);
-            return;
-        }
-        // Non dynamic
-        if (isSpecial) {
-            return inputAttribute(attrName, value, child);
-        }
+        processAttribute(attrName, value, child, scope, ownerTag, howToSet);
     });
 }
+/** Looking for (class | style) followed by a period */
 export function isSpecialAttr(attrName) {
     return attrName.search(/^(class|style)(\.)/) >= 0;
 }
+function processAttribute(attrName, value, child, scope, ownerTag, howToSet) {
+    if (isTagVar(value)) {
+        return processScopedNameValueAttr(attrName, value, child, scope, ownerTag, howToSet);
+    }
+    if (isTagVar(attrName)) {
+        const contextValueSubject = getContextValueByVarString(scope, attrName);
+        let lastValue;
+        // the above callback gets called immediately since its a ValueSubject()
+        const sub = contextValueSubject.subscribe((value) => {
+            processNameOnlyAttr(value, lastValue, child, ownerTag, howToSet);
+            lastValue = value;
+        });
+        ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
+        child.removeAttribute(attrName);
+        return;
+    }
+    // Non dynamic
+    const isSpecial = isSpecialAttr(attrName);
+    if (isSpecial) {
+        return inputAttribute(attrName, value, child);
+    }
+}
+const startRegX = /^\s*{__tagvar/;
+const endRegX = /}\s*$/;
+function isTagVar(value) {
+    return value && value.search(startRegX) >= 0 && value.search(endRegX) >= 0;
+}
+function processNameOnlyAttr(attrValue, lastValue, child, ownerTag, howToSet) {
+    if (lastValue && lastValue != attrValue) {
+        if (typeof (lastValue) === 'string') {
+            child.removeAttribute(lastValue);
+        }
+        else if (lastValue instanceof Object) {
+            Object.entries(lastValue).forEach(([name]) => child.removeAttribute(name));
+        }
+    }
+    if (typeof (lastValue) === 'string') {
+        if (!attrValue.length) {
+            return;
+        }
+        processNameValueAttr(attrValue, '', child, ownerTag, howToSet);
+        return;
+    }
+    if (attrValue instanceof Object) {
+        Object.entries(attrValue).forEach(([name, value]) => processNameValueAttr(name, value, child, ownerTag, howToSet));
+        return;
+    }
+}
+function getContextValueByVarString(scope, value) {
+    const code = value.replace('{', '').split('').reverse().join('').replace('}', '').split('').reverse().join('');
+    return scope[code];
+}
+function processNameValueAttr(attrName, result, child, ownerTag, howToSet) {
+    const isSpecial = isSpecialAttr(attrName);
+    // attach as callback
+    if (result instanceof Function) {
+        ;
+        child[attrName] = function (...args) {
+            return result(child, args);
+        };
+        return;
+    }
+    if (isSubjectInstance(result)) {
+        child.removeAttribute(attrName);
+        const callback = (newAttrValue) => processSubjectValue(newAttrValue, child, attrName, isSpecial, result, howToSet);
+        // the above callback gets called immediately since its a ValueSubject()
+        const sub = result.subscribe(callback);
+        ownerTag.cloneSubs.push(sub); // this is where unsubscribe is picked up
+        return;
+    }
+    howToSet(attrName, result);
+    // child.setAttribute(attrName, result.value)
+    return;
+}
+function processSubjectValue(newAttrValue, child, attrName, isSpecial, result, howToSet) {
+    if (newAttrValue instanceof Function) {
+        ;
+        child[attrName] = function (...args) {
+            return newAttrValue(child, args);
+        };
+        child[attrName].tagFunction = newAttrValue;
+        return;
+    }
+    if (isSpecial) {
+        inputAttribute(attrName, newAttrValue, child);
+        return;
+    }
+    if (newAttrValue) {
+        howToSet(attrName, newAttrValue);
+        // child.setAttribute(attrName, newAttrValue)
+        return;
+    }
+    const isDeadValue = newAttrValue === undefined || newAttrValue === false || newAttrValue === null;
+    if (isDeadValue) {
+        child.removeAttribute(attrName);
+        return;
+    }
+    // value is 0
+    howToSet(attrName, newAttrValue);
+    // child.setAttribute(attrName, newAttrValue)
+}
+function processScopedNameValueAttr(attrName, value, // {__tagVarN}
+child, scope, ownerTag, howToSet) {
+    // get the code inside the brackets like "variable0" or "{variable0}"
+    const result = getContextValueByVarString(scope, value);
+    return processNameValueAttr(attrName, result, child, ownerTag, howToSet);
+}
 //# sourceMappingURL=interpolateAttributes.js.map

package/js/js/interpolateAttributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../ts/interpolateAttributes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../ts/interpolateAttributes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,KAAc,EACd,QAAa;IAEb,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAA;IAE3C,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,KAAK,UAAU,CAAA;IAChD,IAAG,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA,CAAC,uBAAuB;QACxE,gBAAgB,CAAC,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAE,KAAa,CAAC,KAAK,GAAG,KAAK,CAAC,CAAA;IACjH,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IAEjF,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC1C,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,aAAa,CAC3B,QAAyB;IAEzB,OAAO,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;AACnD,CAAC;AAED,SAAS,gBAAgB,CACvB,QAAgB,EAChB,KAAoB,EACpB,KAAc,EACd,KAAc,EACd,QAAa,EACb,QAA8C;IAE9C,IAAK,QAAQ,CAAC,KAAK,CAAC,EAAG,CAAC;QACtB,OAAO,0BAA0B,CAC/B,QAAQ,EACR,KAAe,EACf,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CAAA;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAG,CAAC;QACxB,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACvE,IAAI,SAAc,CAAC;QAEnB,wEAAwE;QACxE,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC,KAAU,EAAE,EAAE;YACvD,mBAAmB,CACjB,KAAK,EACL,SAAS,EACT,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CAAA;YAED,SAAS,GAAG,KAAK,CAAA;QACnB,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA,CAAC,yCAAyC;QACtE,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAE/B,OAAM;IACR,CAAC;IAED,cAAc;IACd,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;IACzC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC;AAED,MAAM,SAAS,GAAG,eAAe,CAAA;AACjC,MAAM,OAAO,GAAG,OAAO,CAAA;AACvB,SAAS,QAAQ,CAAC,KAAoB;IACpC,OAAO,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC5E,CAAC;AAED,SAAS,mBAAmB,CAC1B,SAAuC,EACvC,SAAmD,EACnD,KAAc,EACd,QAAa,EACb,QAAkB;IAElB,IAAG,SAAS,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;QACvC,IAAG,OAAM,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,CAAC,SAAmB,CAAC,CAAA;QAC5C,CAAC;aAAM,IAAG,SAAS,YAAY,MAAM,EAAE,CAAC;YACtC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAC3C,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAC5B,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAG,OAAM,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;QAClC,IAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,OAAM;QACR,CAAC;QAED,oBAAoB,CAClB,SAAmB,EACnB,EAAE,EACF,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CAAA;QAED,OAAM;IACR,CAAC;IAED,IAAG,SAAS,YAAY,MAAM,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAClD,oBAAoB,CAClB,IAAI,EACJ,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,CACT,CACF,CAAA;QAED,OAAM;IACR,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CACjC,KAAc,EACd,KAAa;IAEb,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAC,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC5G,OAAO,KAAK,CAAC,IAAI,CAAC,CAAA;AACpB,CAAC;AAID,SAAS,oBAAoB,CAC3B,QAAgB,EAChB,MAAW,EACX,KAAc,EACd,QAAa,EACb,QAAkB;IAElB,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;IAEzC,qBAAqB;IACrB,IAAG,MAAM,YAAY,QAAQ,EAAE,CAAC;QAC9B,CAAC;QAAC,KAAa,CAAC,QAAQ,CAAC,GAAG,UAAS,GAAG,IAAW;YACjD,OAAO,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC5B,CAAC,CAAA;QACD,OAAM;IACR,CAAC;IAED,IAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/B,MAAM,QAAQ,GAAG,CAAC,YAAiB,EAAE,EAAE,CACrC,mBAAmB,CACjB,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,SAAS,EACT,MAAM,EACN,QAAQ,CACT,CAAA;QAEH,wEAAwE;QACxE,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,QAAe,CAAC,CAAA;QAC7C,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA,CAAC,yCAAyC;QAEtE,OAAM;IACR,CAAC;IAED,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC1B,6CAA6C;IAC7C,OAAM;AACR,CAAC;AAED,SAAS,mBAAmB,CAC1B,YAAiB,EACjB,KAAc,EACd,QAAgB,EAChB,SAAkB,EAClB,MAAW,EACX,QAAkB;IAElB,IAAG,YAAY,YAAY,QAAQ,EAAE,CAAC;QACpC,CAAC;QAAC,KAAa,CAAC,QAAQ,CAAC,GAAG,UAAS,GAAG,IAAW;YACjD,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAClC,CAAC,CAGA;QAAC,KAAa,CAAC,QAAQ,CAAC,CAAC,WAAW,GAAG,YAAY,CAAA;QAEpD,OAAM;IACR,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;QAC7C,OAAM;IACR,CAAC;IAED,IAAG,YAAY,EAAE,CAAC;QAChB,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAChC,6CAA6C;QAC7C,OAAM;IACR,CAAC;IAED,MAAM,WAAW,GAAG,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,KAAK,IAAI,YAAY,KAAK,IAAI,CAAA;IACjG,IAAG,WAAW,EAAE,CAAC;QACf,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/B,OAAM;IACR,CAAC;IAED,aAAa;IACb,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAChC,6CAA6C;AAC/C,CAAC;AAED,SAAS,0BAA0B,CACjC,QAAgB,EAChB,KAAa,EAAE,cAAc;AAC7B,KAAc,EACd,KAAc,EACd,QAAa,EACb,QAA8C;IAE9C,qEAAqE;IACrE,MAAM,MAAM,GAAG,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACvD,OAAO,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AAC1E,CAAC"}

package/js/js/interpolateContentTemplates.d.ts

@@ -1,3 +1,5 @@
+import { Clones } from "./Clones.type.js";
 import { Tag } from "./Tag.class.js";
+import { InterpolateOptions } from "./interpolateElement.js";
 /** Returns subscriptions[] that will need to be unsubscribed from when element is destroyed */
-export declare function interpolateContentTemplates(element: Element, variable: any, ownerTag: Tag): void;
+export declare function interpolateContentTemplates(element: Element, variable: any, tag: Tag, options: InterpolateOptions): Clones;

package/js/js/interpolateContentTemplates.js

@@ -1,42 +1,41 @@
 import { interpolateTemplate } from "./interpolateTemplate.js";
+const templateSearch = new RegExp('\\s*<template interpolate end id="__tagvar(\\d{1,4})"([^>]*)></template>(\\s*)');
 /** Returns subscriptions[] that will need to be unsubscribed from when element is destroyed */
-export function interpolateContentTemplates(element, variable, ownerTag) {
+export function interpolateContentTemplates(element, variable, tag, options) {
     if (!element.children || element.tagName === 'TEMPLATE') {
-        return; // done
+        return []; // done
     }
     const counts = {
         added: 0,
         removed: 0,
     };
+    const clones = [];
     const children = new Array(...element.children);
+    if (element.tagName === 'TEXTAREA') {
+        scanTextAreaValue(element);
+    }
     children.forEach((child, index) => {
-        interpolateChild(child, index, children);
+        const nextClones = interpolateChild(child, options, variable, tag, counts);
+        if (child.tagName === 'TEXTAREA') {
+            scanTextAreaValue(child);
+        }
+        clones.push(...nextClones);
         if (child.children) {
             const nextKids = new Array(...child.children);
-            nextKids.forEach((subChild, index) => {
+            nextKids.forEach(subChild => {
                 if (isRenderEndTemplate(subChild)) {
-                    interpolateChild(subChild, index, nextKids);
+                    interpolateChild(subChild, options, variable, tag, counts);
                 }
-                interpolateContentTemplates(subChild, variable, ownerTag);
+                const nextClones = interpolateContentTemplates(subChild, variable, tag, options);
+                clones.push(...nextClones);
             });
         }
     });
-    function interpolateChild(child, index, children) {
-        children.forEach((child, subIndex) => {
-            if (subIndex < index) {
-                return; // too low
-            }
-            if (child.tagName !== 'TEMPLATE') {
-                return; // not a template
-            }
-            if (child.getAttribute('interpolate') === undefined || child.getAttribute('end') === undefined) {
-                return; // not a rendering template
-            }
-            return child;
-        });
-        interpolateTemplate(child, variable, ownerTag, counts);
-    }
-    return;
+    return clones;
+}
+function interpolateChild(child, options, variable, tag, counts) {
+    const clones = interpolateTemplate(child, variable, tag, counts, options);
+    return clones;
 }
 function isRenderEndTemplate(child) {
     const isTemplate = child.tagName === 'TEMPLATE';
@@ -44,4 +43,15 @@ function isRenderEndTemplate(child) {
         child.getAttribute('interpolate') !== undefined &&
         child.getAttribute('end') !== undefined;
 }
+function scanTextAreaValue(textarea) {
+    const value = textarea.value;
+    if (value.search(templateSearch) >= 0) {
+        const match = value.match(/__tagvar(\d{1,4})/);
+        const result = match ? match[0] : '';
+        const token = '{' + result + '}';
+        // textarea.value = token
+        textarea.value = '';
+        textarea.setAttribute('textVarValue', token);
+    }
+}
 //# sourceMappingURL=interpolateContentTemplates.js.map

package/js/js/interpolateContentTemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../ts/interpolateContentTemplates.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAEtE,+FAA+F;AAC/F,MAAM,UAAU,2BAA2B,CACzC,OAAgB,EAChB,QAAa,EACb,QAAa;IAEb,IAAK,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAG,CAAC;QAC1D,OAAM,CAAC,OAAO;IAChB,CAAC;IACD,MAAM,MAAM,GAAW;QACrB,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,CAAC;KACX,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAI,OAAO,CAAC,QAAgB,CAAC,CAAA;IAExD,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAChC,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAExC,IAAK,KAAK,CAAC,QAAQ,EAAG,CAAC;YACrB,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC7C,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;gBACnC,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;gBAC7C,CAAC;gBAED,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,SAAS,gBAAgB,CACvB,KAAc,EACd,KAAa,EACb,QAAmB;QAEnB,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACnC,IAAK,QAAQ,GAAG,KAAK,EAAG,CAAC;gBACvB,OAAM,CAAC,UAAU;YACnB,CAAC;YAED,IAAK,KAAK,CAAC,OAAO,KAAG,UAAU,EAAG,CAAC;gBACjC,OAAM,CAAC,iBAAiB;YAC1B,CAAC;YAED,IAAK,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,KAAG,SAAS,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,SAAS,EAAG,CAAC;gBAC/F,OAAM,CAAC,2BAA2B;YACpC,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;QAEF,mBAAmB,CACjB,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,CACP,CAAA;IACH,CAAC;IAED,OAAM;AACR,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,KAAG,UAAU,CAAA;IAC7C,OAAO,UAAU;QACjB,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,SAAS;QAC/C,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,SAAS,CAAA;AACzC,CAAC"}
+{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../ts/interpolateContentTemplates.ts"],"names":[],"mappings":"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"}

package/js/js/interpolateElement.d.ts

@@ -1,14 +1,9 @@
 import { Context, Tag } from "./Tag.class.js";
-/**
- *
- * @param {*} element
- * @param {*} context
- * @param {Tag} ownerTag
- */
-export declare function interpolateElement(element: Element, context: Context, // variables used to evaluate
-ownerTag: Tag): void;
-/** Convert interpolations into template tags */
-export declare function interpolateElementChild(child: Element): {
-    string: string;
-    keys: string[];
+import { Clones } from "./Clones.type.js";
+export type InterpolateOptions = {
+    /** make the element go on document */
+    forceElement?: boolean;
+    depth: number;
 };
+export declare function interpolateElement(element: Element, context: Context, // variables used to evaluate
+tag: Tag, options: InterpolateOptions): Clones;

package/js/js/interpolateElement.js

@@ -2,32 +2,29 @@ import { interpolateAttributes } from "./interpolateAttributes.js";
 import { interpolateToTemplates } from "./interpolations.js";
 import { interpolateContentTemplates } from "./interpolateContentTemplates.js";
 import { escapeSearch, variablePrefix } from "./Tag.class.js";
-/**
- *
- * @param {*} element
- * @param {*} context
- * @param {Tag} ownerTag
- */
 export function interpolateElement(element, context, // variables used to evaluate
-ownerTag) {
-    const result = interpolateElementChild(element);
+tag, options) {
+    const clones = [];
+    const result = interpolateElementChild(element, options.depth + 1);
     if (result.keys.length) {
-        interpolateContentTemplates(element, context, ownerTag);
+        const nextClones = interpolateContentTemplates(element, context, tag, options);
+        clones.push(...nextClones);
     }
-    interpolateAttributes(element, context, ownerTag);
-    function processChildren(children) {
-        new Array(...children).forEach(child => {
-            interpolateAttributes(child, context, ownerTag);
-            if (child.children) {
-                processChildren(child.children);
-            }
-        });
-    }
-    processChildren(element.children);
+    interpolateAttributes(element, context, tag);
+    processChildrenAttributes(element.children, context, tag);
+    return clones;
+}
+function processChildrenAttributes(children, context, ownerTag) {
+    new Array(...children).forEach(child => {
+        interpolateAttributes(child, context, ownerTag);
+        if (child.children) {
+            processChildrenAttributes(child.children, context, ownerTag);
+        }
+    });
 }
 /** Convert interpolations into template tags */
-export function interpolateElementChild(child) {
-    const result = interpolateToTemplates(child.innerHTML);
+function interpolateElementChild(child, depth) {
+    const result = interpolateToTemplates(child.innerHTML, { depth });
     result.string = result.string.replace(escapeSearch, variablePrefix);
     child.innerHTML = result.string;
     return result;

package/js/js/interpolateElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateElement.js","sourceRoot":"","sources":["../ts/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,EAAgB,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE3E;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,OAAgB,EAAE,6BAA6B;AAC/C,QAAa;IAEb,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAA;IAE/C,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACzD,CAAC;IAED,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEjD,SAAS,eAAe,CAAC,QAAwB;QAC/C,IAAI,KAAK,CAAC,GAAG,QAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC5C,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;YAE/C,IAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAClB,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACjC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AACnC,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,uBAAuB,CACrC,KAAc;IAEd,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACtD,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACnE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;IAC/B,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"interpolateElement.js","sourceRoot":"","sources":["../ts/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC9E,OAAO,EAAgB,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAS3E,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,OAAgB,EAAE,6BAA6B;AAC/C,GAAQ,EACR,OAA2B;IAE3B,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAElE,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;QAC9E,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;IAC9B,CAAC;IAED,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;IAC5C,yBAAyB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;IAEzD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAwB,EACxB,OAAgB,EAChB,QAAa;IAEb,IAAI,KAAK,CAAC,GAAG,QAAe,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC5C,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAE/C,IAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAClB,yBAAyB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,gDAAgD;AAChD,SAAS,uBAAuB,CAC9B,KAAc,EACd,KAAa;IAEb,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,SAAS,EAAE,EAAC,KAAK,EAAC,CAAC,CAAA;IAC/D,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACnE,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;IAC/B,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/js/interpolateTemplate.d.ts

@@ -1,21 +1,17 @@
-import { Context, Tag } from "./Tag.class.js";
-import { TemplaterResult } from "./tag.js";
-export declare function interpolateTemplate(template: Element & {
-    clone?: any;
-}, // <template end interpolate /> (will be removed)
-context: Context, // variable scope of {`__tagVar${index}`:'x'}
-ownerTag: Tag, // Tag class
-counts: Counts): void;
-export declare function updateBetweenTemplates(value: any, lastFirstChild: Element): Text;
+import { Context, ElementBuildOptions, Tag } from "./Tag.class.js";
+import { InterpolateOptions } from "./interpolateElement.js";
+import { Clones } from "./Clones.type.js";
+export type Template = Element & {
+    clone: any;
+};
+export declare function interpolateTemplate(template: Template, // <template end interpolate /> (will be removed)
+context: Context, // variable scope of {`__tagvar${index}`:'x'}
+tag: Tag, // Tag class
+counts: Counts, // {added:0, removed:0}
+options: InterpolateOptions): Clones;
+export declare function updateBetweenTemplates(value: string | undefined | boolean | number, lastFirstChild: Element): Text;
 export type Counts = {
-    added: 0;
-    removed: 0;
+    added: number;
+    removed: number;
 };
-/** Returns {clones:[], subs:[]} */
-export declare function processTagResult(tag: Tag, result: any, // used for recording past and current value
-insertBefore: Element, // <template end interpolate />
-{ index, counts, }: {
-    index?: number;
-    counts: Counts;
-}): void;
-export declare function isTagComponent(value: unknown | TemplaterResult): boolean;
+export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions): void;