taggedjs 2.4.2 → 2.4.12

package/js/hasTagSupportChanged.function.js

@@ -1,33 +1,42 @@
-import { deepEqual } from "./deepFunctions.js";
-export function hasTagSupportChanged(oldTagSupport, newTagSupport) {
-    if (oldTagSupport === newTagSupport) {
-        throw new Error('someting here');
+import { deepEqual } from "./deepFunctions";
+export function hasTagSupportChanged(oldTagSupport, newTagSupport, newTemplater) {
+    const sameSupport = oldTagSupport === newTagSupport;
+    const samePropConfig = oldTagSupport.propsConfig === newTagSupport.propsConfig;
+    // const sameProps = oldTagSupport.propsConfig.latest === newTagSupport.propsConfig.latest
+    if (sameSupport) {
+        throw new Error('sameSupport - 22');
     }
-    const oldProps = oldTagSupport.propsConfig.latest;
-    const latestProps = newTagSupport.propsConfig.latest;
-    const oldClonedProps = oldTagSupport.propsConfig.latestCloned;
-    const propsChanged = hasPropChanges(latestProps, oldClonedProps, oldProps);
+    if (samePropConfig) {
+        throw new Error('samePropConfig - 22');
+    }
+    if (newTagSupport.templater.isTag || oldTagSupport.templater.isTag || newTemplater.isTag) {
+        throw new Error('trying to compare a basic tag');
+    }
+    const latestProps = newTemplater.props; // newTagSupport.propsConfig.latest
+    const pastCloneProps = oldTagSupport.propsConfig.latestCloned;
+    const propsChanged = hasPropChanges(latestProps, pastCloneProps);
     // if no changes detected, no need to continue to rendering further tags
     if (propsChanged) {
-        return true;
+        return propsChanged;
     }
     const kidsChanged = hasKidsChanged(oldTagSupport, newTagSupport);
     // we already know props didn't change and if kids didn't either, than don't render
     return kidsChanged;
 }
 export function hasPropChanges(props, // natural props
-pastCloneProps, // previously cloned props
-compareToProps) {
-    const isCommonEqual = props === undefined && props === compareToProps;
-    if (isCommonEqual) {
-        return false;
+pastCloneProps) {
+    /*
+    const isCommonEqual = props === undefined && props === compareToProps
+    if(isCommonEqual) {
+      return false
     }
+    */
     let castedProps = props;
     let castedPastProps = pastCloneProps;
     // check all prop functions match
     if (typeof (props) === 'object') {
         if (!pastCloneProps) {
-            return true;
+            return 3;
         }
         castedProps = { ...props };
         castedPastProps = { ...(pastCloneProps || {}) };
@@ -37,7 +46,7 @@ compareToProps) {
             }*/
             let compare = castedPastProps[key];
             if (!(value instanceof Function)) {
-                return true; // this will be checked in deepEqual
+                return 4; // this will be checked in deepEqual
             }
             if (!(compare instanceof Function)) {
                 return false; // its a function now but was not before
@@ -55,14 +64,14 @@ compareToProps) {
             }
             delete castedProps[key]; // its a function and not needed to be compared
             delete castedPastProps[key]; // its a function and not needed to be compared
-            return true;
+            return 5;
         });
         if (!allFunctionsMatch) {
-            return true; // a change has been detected by function comparisons
+            return 6; // a change has been detected by function comparisons
         }
     }
-    const isEqual = deepEqual(pastCloneProps, props);
-    return !isEqual; // if equal then no changes
+    const isEqual = deepEqual(castedPastProps, castedProps);
+    return isEqual ? false : 7; // if equal then no changes
 }
 export function hasKidsChanged(oldTagSupport, newTagSupport) {
     const oldCloneKidValues = oldTagSupport.propsConfig.lastClonedKidValues;
@@ -71,6 +80,6 @@ export function hasKidsChanged(oldTagSupport, newTagSupport) {
         const x = newClonedKidValues[index];
         return set.every((item, index) => item === x[index]);
     });
-    return !everySame;
+    return everySame ? false : 9;
 }
 //# sourceMappingURL=hasTagSupportChanged.function.js.map

package/js/hasTagSupportChanged.function.js.map

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

package/js/html.d.ts

@@ -1,2 +1,2 @@
-import { Tag } from "./Tag.class.js";
+import { Tag } from "./Tag.class";
 export declare function html(strings: string[] | TemplateStringsArray, ...values: unknown[]): Tag;

package/js/html.js

@@ -1,4 +1,4 @@
-import { Tag } from "./Tag.class.js";
+import { Tag } from "./Tag.class";
 export function html(strings, ...values) {
     return new Tag(strings, values);
 }

package/js/html.js.map

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["../ts/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,MAAM,UAAU,IAAI,CAClB,OAAwC,EACxC,GAAG,MAAiB;IAEpB,OAAO,IAAI,GAAG,CAAC,OAAmB,EAAE,MAAM,CAAC,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["../ts/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,MAAM,UAAU,IAAI,CAClB,OAAwC,EACxC,GAAG,MAAiB;IAEpB,OAAO,IAAI,GAAG,CAAC,OAAmB,EAAE,MAAM,CAAC,CAAA;AAC7C,CAAC"}

package/js/index.d.ts

@@ -1,30 +1,25 @@
-/** Must use .js and NOT .ts extensions here */
-import { redrawTag } from "./redrawTag.function.js";
-import { tagElement } from "./tagElement.js";
-export * from "./ElementTargetEvent.interface.js";
-export * from "./tag.js";
-export * from "./html.js";
-export * from "./errors.js";
-export * from "./Subject.js";
-export * from "./isInstance.js";
-export * from "./ValueSubject.js";
-export * from "./watch.function.js";
-export * from "./TagSupport.class.js";
-export * from "./gateway/index.js";
-export * from "./redrawTag.function.js";
-export * from "./interpolateElement.js";
-export { tagElement } from "./tagElement.js";
-export { Tag } from "./Tag.class.js";
-export { runBeforeRender } from "./tagRunner.js";
-export { setUse } from "./setUse.function.js";
-export { providers } from "./providers.js";
-export { set } from "./set.function.js";
-export { setLet } from "./setLet.function.js";
-export { setProp } from "./setProp.function.js";
-export * from "./onInit.js";
-export * from "./onDestroy.js";
-export * from "./getCallback.js";
+import { tagElement } from "./tagElement";
+export * from "./ElementTargetEvent.interface";
+export * from "./tag";
+export * from "./html";
+export * from "./errors";
+export * from "./Subject";
+export * from "./isInstance";
+export * from "./ValueSubject";
+export * from "./watch.function";
+export * from "./TagSupport.class";
+export * from "./interpolateElement";
+export { tagElement } from "./tagElement";
+export { Tag } from "./Tag.class";
+export { runBeforeRender } from "./tagRunner";
+export { setUse } from "./setUse.function";
+export { providers } from "./providers";
+export { set } from "./set.function";
+export { setLet } from "./setLet.function";
+export { setProp } from "./setProp.function";
+export * from "./onInit";
+export * from "./onDestroy";
+export * from "./getCallback";
 export declare const hmr: {
     tagElement: typeof tagElement;
-    redrawTag: typeof redrawTag;
 };

package/js/index.js

@@ -1,34 +1,33 @@
-/** Must use .js and NOT .ts extensions here */
-import { redrawTag } from "./redrawTag.function.js";
-import { tagElement } from "./tagElement.js";
-export * from "./ElementTargetEvent.interface.js";
-export * from "./tag.js";
-export * from "./html.js";
-export * from "./errors.js";
-export * from "./Subject.js";
-export * from "./isInstance.js";
-export * from "./ValueSubject.js";
-export * from "./watch.function.js";
-export * from "./TagSupport.class.js";
-export * from "./gateway/index.js";
-export * from "./redrawTag.function.js";
-export * from "./interpolateElement.js";
+// import { redrawTag } from "./redrawTag.function"
+import { tagElement } from "./tagElement";
+export * from "./ElementTargetEvent.interface";
+export * from "./tag";
+export * from "./html";
+export * from "./errors";
+export * from "./Subject";
+export * from "./isInstance";
+export * from "./ValueSubject";
+export * from "./watch.function";
+export * from "./TagSupport.class";
+// export * from "./redrawTag.function"
+export * from "./interpolateElement";
 // TODO: export *
-export { tagElement } from "./tagElement.js";
-export { Tag } from "./Tag.class.js";
-export { runBeforeRender } from "./tagRunner.js";
-export { setUse } from "./setUse.function.js";
+export { tagElement } from "./tagElement";
+export { Tag } from "./Tag.class";
+export { runBeforeRender } from "./tagRunner";
+export { setUse } from "./setUse.function";
 /* hooks */
 // TODO: export *
-export { providers } from "./providers.js";
-export { set } from "./set.function.js";
-export { setLet } from "./setLet.function.js";
-export { setProp } from "./setProp.function.js";
-export * from "./onInit.js";
-export * from "./onDestroy.js";
-export * from "./getCallback.js";
+export { providers } from "./providers";
+export { set } from "./set.function";
+export { setLet } from "./setLet.function";
+export { setProp } from "./setProp.function";
+export * from "./onInit";
+export * from "./onDestroy";
+export * from "./getCallback";
 /* end: hooks */
 export const hmr = {
-    tagElement, redrawTag
+    tagElement,
+    // redrawTag
 };
 //# sourceMappingURL=index.js.map

package/js/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,cAAc,mCAAmC,CAAA;AAEjD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,yBAAyB,CAAA;AACvC,cAAc,yBAAyB,CAAA;AAEvC,iBAAiB;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,WAAW;AACT,iBAAiB;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAClC,gBAAgB;AAEhB,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,UAAU,EAAE,SAAS;CACtB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"AAAA,mDAAmD;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,cAAc,gCAAgC,CAAA;AAE9C,cAAc,OAAO,CAAA;AACrB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,uCAAuC;AACvC,cAAc,sBAAsB,CAAA;AAEpC,iBAAiB;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,WAAW;AACT,iBAAiB;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC/B,gBAAgB;AAEhB,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,UAAU;IACV,YAAY;CACb,CAAA"}

package/js/interpolateAttributes.d.ts

@@ -1,4 +1,3 @@
-import { Context, Tag } from "./Tag.class.js";
+import { Context, Tag } from "./Tag.class";
+export type HowToSet = (element: Element, name: string, value: string) => any;
 export declare function interpolateAttributes(child: Element, scope: Context, ownerTag: Tag): void;
-/** Looking for (class | style) followed by a period */
-export declare function isSpecialAttr(attrName: string | String): boolean;

package/js/interpolateAttributes.js

@@ -1,12 +1,5 @@
-import { inputAttribute } from "./inputAttribute.js";
-import { isSubjectInstance } from "./isInstance.js";
+import { processAttribute } from "./processAttribute.function";
 function howToSetAttribute(element, name, value) {
-    /*
-    if(name === 'class'){
-      value.split(' ').forEach(className => child.classList.add(className))
-      return
-    }
-    */
     element.setAttribute(name, value);
 }
 function howToSetInputValue(element, name, value) {
@@ -14,11 +7,6 @@ function howToSetInputValue(element, name, value) {
 }
 export function interpolateAttributes(child, scope, ownerTag) {
     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);
-    }
     let howToSet = howToSetAttribute;
     attrNames.forEach(attrName => {
         if (child.nodeName === 'INPUT' && attrName === 'value') {
@@ -29,118 +17,4 @@ export function interpolateAttributes(child, scope, ownerTag) {
         howToSet = howToSetAttribute; // put back
     });
 }
-/** 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 (attrValue) === '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) {
-        const action = function (...args) {
-            return result(child, args);
-        };
-        child[attrName].action = action;
-        // child.addEventListener(attrName, action)
-    }
-    // Most every variable comes in here since everything is made a ValueSubject
-    if (isSubjectInstance(result)) {
-        child.removeAttribute(attrName);
-        const callback = (newAttrValue) => {
-            return processAttributeSubjectValue(newAttrValue, child, attrName, isSpecial, howToSet);
-        };
-        // 🗞️ Subscribe. Above callback called immediately since its a ValueSubject()
-        const sub = result.subscribe(callback);
-        // Record subscription for later unsubscribe when element destroyed
-        ownerTag.cloneSubs.push(sub);
-        return;
-    }
-    howToSet(child, attrName, result);
-    // child.setAttribute(attrName, result.value)
-    return;
-}
-function processAttributeSubjectValue(newAttrValue, child, attrName, isSpecial, howToSet) {
-    if (newAttrValue instanceof Function) {
-        ;
-        child[attrName] = function (...args) {
-            const result = newAttrValue(child, args);
-            return result;
-        };
-        child[attrName].tagFunction = newAttrValue;
-        return;
-    }
-    if (isSpecial) {
-        inputAttribute(attrName, newAttrValue, child);
-        return;
-    }
-    if (newAttrValue) {
-        howToSet(child, attrName, newAttrValue);
-        return;
-    }
-    const isDeadValue = newAttrValue === undefined || newAttrValue === false || newAttrValue === null;
-    if (isDeadValue) {
-        child.removeAttribute(attrName);
-        return;
-    }
-    // value is 0
-    howToSet(child, 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/interpolateAttributes.js.map

@@ -1 +1 @@
-{"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;AAInD,SAAS,iBAAiB,CACxB,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEb;;;;;MAKE;IAEF,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEZ,OAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;AAChC,CAAC;AAED,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,IAAI,QAAQ,GAAG,iBAAiB,CAAA;IAGhC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAG,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACtD,QAAQ,GAAG,kBAAkB,CAAA;QAC/B,CAAC;QAED,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;QAEnE,QAAQ,GAAG,iBAAiB,CAAA,CAAC,WAAW;IAC1C,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,QAAkB;IAElB,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;AAED,SAAS,oBAAoB,CAC3B,QAAgB,EAChB,MAAW,EACX,KAAc,EACd,QAAa,EACb,QAAkB;IAElB,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;IAEzC,sBAAsB;IACtB,IAAG,MAAM,YAAY,QAAQ,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,UAAS,GAAG,IAAW;YACpC,OAAO,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC5B,CAAC,CAEA;QAAC,KAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,MAAM,CAAA;QACzC,2CAA2C;IAC7C,CAAC;IAED,4EAA4E;IAC5E,IAAG,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/B,MAAM,QAAQ,GAAG,CAAC,YAAiB,EAAE,EAAE;YACrC,OAAO,4BAA4B,CACjC,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,SAAS,EACT,QAAQ,CACT,CAAA;QACH,CAAC,CAAA;QAED,8EAA8E;QAC9E,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,QAAe,CAAC,CAAA;QAE7C,mEAAmE;QACnE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAE5B,OAAM;IACR,CAAC;IAED,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACjC,6CAA6C;IAC7C,OAAM;AACR,CAAC;AAED,SAAS,4BAA4B,CACnC,YAAiB,EACjB,KAAc,EACd,QAAgB,EAChB,SAAkB,EAClB,QAAkB;IAElB,IAAG,YAAY,YAAY,QAAQ,EAAE,CAAC;QACpC,CAAC;QAAC,KAAa,CAAC,QAAQ,CAAC,GAAG,UAAS,GAAG,IAAW;YACjD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACxC,OAAO,MAAM,CAAA;QACf,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,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;QACvC,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,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;AACzC,CAAC;AAED,SAAS,0BAA0B,CACjC,QAAgB,EAChB,KAAa,EAAE,cAAc;AAC7B,KAAc,EACd,KAAc,EACd,QAAa,EACb,QAAkB;IAElB,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"}
+{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../ts/interpolateAttributes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAI9D,SAAS,iBAAiB,CACxB,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEb,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEZ,OAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAc,EACd,KAAc,EACd,QAAa;IAEb,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAA;IAE3C,IAAI,QAAQ,GAAG,iBAAiB,CAAA;IAEhC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAG,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACtD,QAAQ,GAAG,kBAAkB,CAAA;QAC/B,CAAC;QAED,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;QAEnE,QAAQ,GAAG,iBAAiB,CAAA,CAAC,WAAW;IAC1C,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/js/interpolateContentTemplates.d.ts

@@ -1,6 +1,9 @@
-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, // <div><div></div><template tag-wrap="22">...</template></div>
-context: any, tag: Tag, options: InterpolateOptions, children: HTMLCollection): Clones;
+import { Clones } from "./Clones.type";
+import { Tag } from "./Tag.class";
+import { InterpolateOptions } from "./interpolateElement";
+import { InterpolateComponentResult } from "./interpolateTemplate";
+export type InterpolatedContentTemplates = {
+    clones: Clones;
+    tagComponents: InterpolateComponentResult[];
+};
+export declare function interpolateContentTemplates(element: Element, context: any, tag: Tag, options: InterpolateOptions, children: HTMLCollection): InterpolatedContentTemplates;

package/js/interpolateContentTemplates.js

@@ -1,36 +1,37 @@
-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, // <div><div></div><template tag-wrap="22">...</template></div>
-context, tag, options, children) {
+import { interpolateTemplate } from "./interpolateTemplate";
+export function interpolateContentTemplates(element, context, tag, options, children) {
     if (!children || element.tagName === 'TEMPLATE') {
-        return []; // done
+        return { clones: [], tagComponents: [] }; // done
     }
     // counting for animation stagger computing
     const counts = options.counts;
     const clones = [];
+    const tagComponents = [];
     const childArray = new Array(...children);
-    if (element.tagName === 'TEXTAREA') {
-        scanTextAreaValue(element);
-    }
-    childArray.forEach((child, childIndex) => {
-        const nextClones = interpolateTemplate(child, context, tag, counts, options);
-        if (child.tagName === 'TEXTAREA') {
-            scanTextAreaValue(child);
-        }
+    childArray.forEach(child => {
+        const { clones: nextClones, tagComponent } = interpolateTemplate(child, context, tag, counts, options);
         clones.push(...nextClones);
+        if (tagComponent) {
+            tagComponents.push(tagComponent);
+            return;
+        }
         if (child.children) {
             const nextKids = new Array(...child.children);
             nextKids.forEach((subChild, index) => {
+                // IF <template end /> its a variable to be processed
                 if (isRenderEndTemplate(subChild)) {
-                    interpolateTemplate(subChild, context, tag, counts, options);
+                    const { tagComponent } = interpolateTemplate(subChild, context, tag, counts, options);
+                    if (tagComponent) {
+                        tagComponents.push(tagComponent);
+                    }
                 }
-                const nextClones = interpolateContentTemplates(subChild, context, tag, options, subChild.children);
+                const { clones: nextClones, tagComponents: nextTagComponent } = interpolateContentTemplates(subChild, context, tag, options, subChild.children);
                 clones.push(...nextClones);
+                tagComponents.push(...nextTagComponent);
             });
         }
     });
-    return clones;
+    return { clones, tagComponents };
 }
 function isRenderEndTemplate(child) {
     const isTemplate = child.tagName === 'TEMPLATE';
@@ -38,15 +39,4 @@ 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/interpolateContentTemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../ts/interpolateContentTemplates.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAEhF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,gFAAgF,CAAC,CAAA;AAEnH,+FAA+F;AAC/F,MAAM,UAAU,2BAA2B,CACzC,OAAgB,EAAE,+DAA+D;AACjF,OAAY,EACZ,GAAQ,EACR,OAA2B,EAC3B,QAAwB;IAGxB,IAAK,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAG,CAAC;QAClD,OAAO,EAAE,CAAA,CAAC,OAAO;IACnB,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAW,EAAE,CAAA;IACzB,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAA;IAEzC,IAAG,OAAO,CAAC,OAAO,KAAG,UAAU,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAA8B,CAAC,CAAA;IACnD,CAAC;IAED,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACvC,MAAM,UAAU,GAAG,mBAAmB,CACpC,KAAiB,EACjB,OAAO,EACP,GAAG,EACH,MAAM,EACN,OAAO,CACR,CAAA;QAED,IAAG,KAAK,CAAC,OAAO,KAAG,UAAU,EAAE,CAAC;YAC9B,iBAAiB,CAAC,KAA4B,CAAC,CAAA;QACjD,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;QAE1B,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;gBAEnC,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,mBAAmB,CACjB,QAAoB,EACpB,OAAO,EACP,GAAG,EACH,MAAM,EACN,OAAO,CACR,CAAA;gBACH,CAAC;gBAED,MAAM,UAAU,GAAG,2BAA2B,CAC5C,QAAQ,EACR,OAAO,EACP,GAAG,EACH,OAAO,EACP,QAAQ,CAAC,QAAQ,CAClB,CAAA;gBACD,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;YAC9B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,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;AAED,SAAS,iBAAiB,CAAC,QAA6B;IACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;IAC5B,IAAI,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAG,CAAC,EAAG,CAAC;QACtC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACpC,MAAM,KAAK,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,CAAA;QAChC,yBAAyB;QACzB,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAA;QACnB,QAAQ,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;IAC9C,CAAC;AACH,CAAC"}
+{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../ts/interpolateContentTemplates.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwC,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAOjG,MAAM,UAAU,2BAA2B,CACzC,OAAgB,EAChB,OAAY,EACZ,GAAQ,EACR,OAA2B,EAC3B,QAAwB;IAExB,IAAK,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAG,CAAC;QAClD,OAAO,EAAC,MAAM,EAAC,EAAE,EAAE,aAAa,EAAE,EAAE,EAAC,CAAA,CAAC,OAAO;IAC/C,CAAC;IAED,2CAA2C;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAW,EAAE,CAAA;IACzB,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAA;IAEzC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzB,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAC,GAAG,mBAAmB,CAC5D,KAAiB,EACjB,OAAO,EACP,GAAG,EACH,MAAM,EACN,OAAO,CACR,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;QAE1B,IAAG,YAAY,EAAE,CAAC;YAChB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAChC,OAAM;QACR,CAAC;QAED,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;gBAEnC,qDAAqD;gBACrD,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,MAAM,EAAC,YAAY,EAAC,GAAG,mBAAmB,CACxC,QAAoB,EACpB,OAAO,EACP,GAAG,EACH,MAAM,EACN,OAAO,CACR,CAAA;oBAED,IAAG,YAAY,EAAE,CAAC;wBAChB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;oBAClC,CAAC;gBACH,CAAC;gBAED,MAAM,EAAC,MAAM,EAAC,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAC,GAAG,2BAA2B,CACtF,QAAQ,EACR,OAAO,EACP,GAAG,EACH,OAAO,EACP,QAAQ,CAAC,QAAQ,CAClB,CAAA;gBAED,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;gBAC5B,aAAa,CAAC,IAAI,CAAE,GAAG,gBAAgB,CAAE,CAAA;YAC3C,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,CAAA;AAChC,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"}

package/js/interpolateElement.d.ts

@@ -1,11 +1,12 @@
-import { Context, Tag, TagTemplate } from "./Tag.class.js";
-import { Clones } from "./Clones.type.js";
-import { Counts } from "./interpolateTemplate.js";
+import { InterpolatedContentTemplates } from "./interpolateContentTemplates";
+import { Context, Tag, TagTemplate } from "./Tag.class";
+import { Counts } from "./interpolateTemplate";
 export type InterpolateOptions = {
     /** make the element go on document */
     forceElement?: boolean;
     counts: Counts;
 };
-export declare function interpolateElement(element: Element, context: Context, // variables used to evaluate
-interpolatedTemplates: TagTemplate, tagOwner: Tag, options: InterpolateOptions): Clones;
-export declare function interpolateString(string: string): import("./interpolations.js").InterpolatedTemplates;
+/** Review elements within an element */
+export declare function interpolateElement(container: Element, context: Context, // variables used to evaluate
+interpolatedTemplates: TagTemplate, tagOwner: Tag, options: InterpolateOptions, test?: boolean): InterpolatedContentTemplates;
+export declare function interpolateString(string: string): import("./interpolations").InterpolatedTemplates;

package/js/interpolateElement.js

@@ -1,20 +1,23 @@
-import { interpolateAttributes } from "./interpolateAttributes.js";
-import { interpolateToTemplates } from "./interpolations.js";
-import { interpolateContentTemplates } from "./interpolateContentTemplates.js";
-import { escapeSearch, variablePrefix } from "./Tag.class.js";
-export function interpolateElement(element, context, // variables used to evaluate
-interpolatedTemplates, tagOwner, options) {
+import { interpolateAttributes } from "./interpolateAttributes";
+import { interpolateToTemplates } from "./interpolations";
+import { interpolateContentTemplates } from "./interpolateContentTemplates";
+import { escapeSearch, variablePrefix } from "./Tag.class";
+/** Review elements within an element */
+export function interpolateElement(container, context, // variables used to evaluate
+interpolatedTemplates, tagOwner, options, test = false) {
     const clones = [];
+    const tagComponents = [];
     const result = interpolatedTemplates.interpolation;
-    const template = element.children[0];
+    const template = container.children[0];
     const children = template.content.children;
     if (result.keys.length) {
-        const nextClones = interpolateContentTemplates(element, context, tagOwner, options, children);
+        const { clones: nextClones, tagComponents: nextTagComponents } = interpolateContentTemplates(container, context, tagOwner, options, children);
         clones.push(...nextClones);
+        tagComponents.push(...nextTagComponents);
     }
-    interpolateAttributes(element, context, tagOwner);
+    interpolateAttributes(container, context, tagOwner);
     processChildrenAttributes(children, context, tagOwner);
-    return clones;
+    return { clones, tagComponents };
 }
 function processChildrenAttributes(children, context, ownerTag) {
     new Array(...children).forEach(child => {

package/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,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAUxF,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,OAAgB,EAAE,6BAA6B;AAC/C,qBAAkC,EAClC,QAAa,EACb,OAA2B;IAE3B,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,MAAM,MAAM,GAAG,qBAAqB,CAAC,aAAa,CAAA;IAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAA;IAC3D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAA;IAE1C,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC7F,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;IAC9B,CAAC;IAED,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACjD,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEtD,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,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACnE,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"interpolateElement.js","sourceRoot":"","sources":["../ts/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAgC,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAUrF,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAChC,SAAkB,EAClB,OAAgB,EAAE,6BAA6B;AAC/C,qBAAkC,EAClC,QAAa,EACb,OAA2B,EAC3B,IAAI,GAAG,KAAK;IAEZ,MAAM,MAAM,GAAW,EAAE,CAAA;IACzB,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,MAAM,GAAG,qBAAqB,CAAC,aAAa,CAAA;IAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAA;IAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAA;IAE1C,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAC,GAAG,2BAA2B,CACxF,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAChD,CAAA;QACD,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;QAC5B,aAAa,CAAC,IAAI,CAAE,GAAG,iBAAiB,CAAE,CAAA;IAC5C,CAAC;IAED,qBAAqB,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IACnD,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAEtD,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,CAAA;AAChC,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAwB,EACxB,OAAgB,EAChB,QAAa;IAEb,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACrC,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,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACnE,OAAO,MAAM,CAAA;AACf,CAAC"}