taggedjs 2.5.22 → 2.5.24

package/js/interpolations/bindSubjectCallback.function.js

@@ -1,72 +1,113 @@
 /** File largely responsible for reacting to element events, such as onclick */
-import { setUse } from '../state/setUse.function.js';
+import { syncStates } from '../state/syncStates.function.js';
 import { ValueTypes } from '../tag/ValueTypes.enum.js';
-import { renderTagSupport } from '../tag/render/renderTagSupport.function.js';
+import { renderSupport } from '../tag/render/renderSupport.function.js';
 import { updateExistingTagComponent } from '../tag/update/updateExistingTagComponent.function.js';
 const useLocks = true;
-export function bindSubjectCallback(value, tagSupport) {
+const noData = 'no-data-ever';
+const promiseNoData = 'promise-no-data-ever';
+export function bindSubjectCallback(value, support) {
     // Is this children? No override needed
     if (value.isChildOverride) {
         return value;
     }
-    const state = setUse.memory.stateConfig;
-    const subjectFunction = (element, args) => runTagCallback(value, tagSupport, element, args);
+    // const state = setUse.memory.stateConfig.support?.state as State
+    const state = support.state;
+    const subjectFunction = (element, args) => runTagCallback(value, support, element, args, state);
     // link back to original. Mostly used for <div oninit ondestroy> animations
     subjectFunction.tagFunction = value;
     return subjectFunction;
 }
-export function runTagCallback(value, tagSupport, bindTo, args) {
-    const tag = findTagToCallback(tagSupport);
+export function runTagCallback(value, support, bindTo, args, state) {
+    const tag = findTagToCallback(support);
+    const global = tag.subject.global;
+    /*
+    if(global.deleted) {
+      return noData
+    }
+    */
+    const newest = global.newest;
+    const newState = newest.state;
+    if (newState.length === state.length) {
+        syncStates(newState, state);
+    }
+    // syncStates(newState, tag.state)
     const method = value.bind(bindTo);
-    tag.global.locked = useLocks; // prevent another render from re-rendering this tag
+    tag.subject.global.locked = useLocks; // prevent another render from re-rendering this tag
     const callbackResult = method(...args);
-    return afterTagCallback(tag, callbackResult);
+    return afterTagCallback(tag, callbackResult, state);
 }
-function afterTagCallback(tag, callbackResult) {
-    delete tag.global.locked;
-    if (tag.global.blocked.length) {
+export function afterTagCallback(tag, callbackResult, state) {
+    const global = tag.subject.global;
+    delete global.locked;
+    const blocked = global.blocked;
+    // // syncStates(state, newState)
+    if (blocked.length) {
+        // syncStates(tag.state, (global.newest as Support).state)
         let lastResult;
-        tag.global.blocked.forEach(blocked => {
-            const block = blocked;
-            lastResult = updateExistingTagComponent(block.ownerTagSupport, block, block.subject, block.global.insertBefore, true);
-            tag.global.newest = lastResult;
-            tag.global.blocked.splice(0, 1);
-        });
-        tag.global.blocked.length = 0;
+        lastResult = runBlocked(tag, state, lastResult);
         // return lastResult
-        return checkAfterCallbackPromise(callbackResult, lastResult, lastResult.global);
+        return checkAfterCallbackPromise(callbackResult, lastResult, global);
     }
-    const result = renderCallbackSupport(tag.global.newest, callbackResult, tag.global);
+    const result = renderCallbackSupport(global.newest, callbackResult, global);
     return result;
 }
-function findTagToCallback(tagSupport) {
+export function findTagToCallback(support) {
     // If we are NOT a component than we need to render my owner instead
-    if (tagSupport.templater.tagJsType === ValueTypes.templater) {
-        const owner = tagSupport.ownerTagSupport;
+    if (support.templater.tagJsType === ValueTypes.templater) {
+        const owner = support.ownerSupport;
         return findTagToCallback(owner);
     }
-    return tagSupport;
+    return support;
 }
 function renderCallbackSupport(last, callbackResult, global) {
     if (global.deleted) {
-        return 'no-data-ever'; // || last.global.deleted
+        return noData; // || last.global.deleted
     }
-    renderTagSupport(last, true);
+    renderSupport(last, true);
     return checkAfterCallbackPromise(callbackResult, last, global);
 }
-function checkAfterCallbackPromise(callbackResult, last, global) {
+export function checkAfterCallbackPromise(callbackResult, last, global) {
     if (callbackResult instanceof Promise) {
-        last.global.locked = useLocks;
+        last.subject.global.locked = useLocks;
         return callbackResult.then(() => {
-            delete last.global.locked;
+            delete last.subject.global.locked;
             if (global.deleted) {
-                return 'promise-no-data-ever'; // tag was deleted during event processing
+                return promiseNoData; // tag was deleted during event processing
             }
-            delete last.global.locked;
-            renderTagSupport(global.newest, true);
-            return 'promise-no-data-ever';
+            delete last.subject.global.locked;
+            renderSupport(global.newest, true);
+            return promiseNoData;
         });
     }
-    return 'no-data-ever';
+    return noData;
+}
+export function runBlocked(tag, state, lastResult) {
+    const global = tag.subject.global;
+    const blocked = global.blocked;
+    while (blocked.length > 0) {
+        const block = blocked[0];
+        blocked.splice(0, 1);
+        lastResult = updateExistingTagComponent(block.ownerSupport, block, block.subject, block.subject.global.insertBefore, true);
+        global.newest = lastResult;
+    }
+    global.blocked.length = 0;
+    // global.oldest.updateBy( lastResult as Support )
+    /*
+    if(lastResult) {
+      const newState = lastResult.state
+      syncStates(state, newState)
+  
+      const newest = renderSupport(
+        lastResult,
+        true,
+      )
+      
+      global.newest = newest
+      global.oldest.updateBy( lastResult as Support )
+      syncStates(newState, state)
+    }
+      */
+    return lastResult;
 }
 //# sourceMappingURL=bindSubjectCallback.function.js.map

package/js/interpolations/bindSubjectCallback.function.js.map

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

package/js/interpolations/interpolateAttributes.d.ts

@@ -1,4 +1,5 @@
 import { Context } from '../tag/Tag.class.js';
-import { TagSupport } from '../tag/TagSupport.class.js';
+import { Support } from '../tag/Support.class.js';
 export type HowToSet = (element: Element, name: string, value: string) => any;
-export declare function interpolateAttributes(child: Element, scope: Context, ownerSupport: TagSupport): void;
+export declare function howToSetInputValue(element: Element, name: string, value: string): void;
+export declare function interpolateAttributes(element: Element, scope: Context, ownerSupport: Support): void;

package/js/interpolations/interpolateAttributes.js

@@ -2,20 +2,16 @@ import { processAttribute } from './processAttribute.function.js';
 function howToSetAttribute(element, name, value) {
     element.setAttribute(name, value);
 }
-function howToSetInputValue(element, name, value) {
-    element[name] = value;
+export function howToSetInputValue(element, name, value) {
+    element.setAttribute(name, value);
 }
-export function interpolateAttributes(child, scope, ownerSupport) {
-    const attrNames = child.getAttributeNames();
+export function interpolateAttributes(element, scope, ownerSupport) {
+    const attrNames = element.getAttributeNames();
     let howToSet = howToSetAttribute;
     for (let index = 0; index < attrNames.length; ++index) {
         const attrName = attrNames[index];
-        if (child.nodeName === 'INPUT' && attrName === 'value') {
-            howToSet = howToSetInputValue;
-        }
-        const value = child.getAttribute(attrName);
-        processAttribute(attrName, value, child, scope, ownerSupport, howToSet);
-        howToSet = howToSetAttribute; // put back
+        const value = element.getAttribute(attrName);
+        processAttribute([attrName, value], element, scope, ownerSupport, howToSet);
     }
 }
 //# sourceMappingURL=interpolateAttributes.js.map

package/js/interpolations/interpolateAttributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateAttributes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,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,YAAwB;IAExB,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAA;IAE3C,IAAI,QAAQ,GAAG,iBAAiB,CAAA;IAEhC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;QACjC,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,YAAY,EAAE,QAAQ,CAAC,CAAA;QAEvE,QAAQ,GAAG,iBAAiB,CAAA,CAAC,WAAW;IAC1C,CAAC;AACH,CAAC"}
+{"version":3,"file":"interpolateAttributes.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateAttributes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,SAAS,iBAAiB,CACxB,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEb,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,IAAY,EACZ,KAAa;IAEb,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,KAAc,EACd,YAAqB;IAErB,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAA;IAE7C,IAAI,QAAQ,GAAG,iBAAiB,CAAA;IAEhC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC5C,gBAAgB,CACd,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAC1D,CAAA;IACH,CAAC;AACH,CAAC"}

package/js/interpolations/interpolateContentTemplates.d.ts

@@ -1,9 +1,5 @@
-import { TagSupport } from '../tag/TagSupport.class.js';
-import { InsertBefore } from './InsertBefore.type.js';
+import { Support } from '../tag/Support.class.js';
+import { Context } from '../tag/Tag.class.js';
 import { InterpolateOptions } from './interpolateElement.js';
 import { InterpolateComponentResult } from './interpolateTemplate.js';
-export type InterpolatedContentTemplates = {
-    clones: InsertBefore[];
-    tagComponents: InterpolateComponentResult[];
-};
-export declare function interpolateContentTemplates(context: any, tagSupport: TagSupport, options: InterpolateOptions, children: HTMLCollection): InterpolatedContentTemplates;
+export declare function interpolateContentTemplates(context: Context, support: Support, options: InterpolateOptions, children: HTMLCollection, fragment: DocumentFragment): InterpolateComponentResult[];

package/js/interpolations/interpolateContentTemplates.js

@@ -1,35 +1,39 @@
 import { interpolateTemplate } from './interpolateTemplate.js';
-export function interpolateContentTemplates(context, tagSupport, options, children) {
+export function interpolateContentTemplates(context, support, options, children, fragment) {
     // counting for animation stagger computing
     const counts = options.counts;
-    const clones = [];
     const tagComponents = [];
     const childLength = children.length;
     for (let index = childLength - 1; index >= 0; --index) {
         const child = children[index];
-        const tagComponent = interpolateTemplate(child, context, tagSupport, counts);
+        // const tagComponent =
+        interpolateTemplate(fragment, child, context, support, counts);
         // clones.push(...nextClones)
-        if (tagComponent) {
-            tagComponents.push(tagComponent);
-            continue;
+        /*
+        if(tagComponent) {
+          tagComponents.push(tagComponent)
+          continue
         }
+        */
         if (child.children) {
             for (let index = child.children.length - 1; index >= 0; --index) {
                 const subChild = child.children[index];
                 // IF <template end /> its a variable to be processed
                 if (isRenderEndTemplate(subChild)) {
-                    const tagComponent = interpolateTemplate(subChild, context, tagSupport, counts);
-                    if (tagComponent) {
-                        tagComponents.push(tagComponent);
+                    // const tagComponent =
+                    interpolateTemplate(fragment, subChild, context, support, counts);
+                    /*
+                    if(tagComponent) {
+                      tagComponents.push(tagComponent)
                     }
+                    */
                 }
-                const { clones: nextClones, tagComponents: nextTagComponent } = interpolateContentTemplates(context, tagSupport, options, subChild.children);
-                clones.push(...nextClones);
+                const nextTagComponent = interpolateContentTemplates(context, support, options, subChild.children, fragment);
                 tagComponents.push(...nextTagComponent);
             }
         }
     }
-    return { clones, tagComponents };
+    return tagComponents;
 }
 function isRenderEndTemplate(child) {
     const isTemplate = child.tagName === 'TEMPLATE';

package/js/interpolations/interpolateContentTemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateContentTemplates.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwC,mBAAmB,EAAE,MAAK,0BAA0B,CAAA;AAOnG,MAAM,UAAU,2BAA2B,CACzC,OAAY,EACZ,UAAsB,EACtB,OAA2B,EAC3B,QAAwB;IAExB,2CAA2C;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,MAAM,GAAmB,EAAE,CAAA;IACjC,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAA;IACnC,KAAK,IAAI,KAAK,GAAC,WAAW,GAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7B,MAAM,YAAY,GAAG,mBAAmB,CACtC,KAAiB,EACjB,OAAO,EACP,UAAU,EACV,MAAM,CACP,CAAA;QAED,6BAA6B;QAE7B,IAAG,YAAY,EAAE,CAAC;YAChB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QAED,IAAK,KAAK,CAAC,QAAQ,EAAG,CAAC;YACrB,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;gBAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACtC,qDAAqD;gBACrD,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,MAAM,YAAY,GAAG,mBAAmB,CACtC,QAAoB,EACpB,OAAO,EACP,UAAU,EACV,MAAM,CACP,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,OAAO,EACP,UAAU,EACV,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;QACH,CAAC;IACH,CAAC;IAED,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"}
+{"version":3,"file":"interpolateContentTemplates.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateContentTemplates.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwC,mBAAmB,EAAE,MAAK,0BAA0B,CAAA;AAEnG,MAAM,UAAU,2BAA2B,CACzC,OAAgB,EAChB,OAAgB,EAChB,OAA2B,EAC3B,QAAwB,EACxB,QAA0B;IAE1B,2CAA2C;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAA;IACnC,KAAK,IAAI,KAAK,GAAC,WAAW,GAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7B,uBAAuB;QACvB,mBAAmB,CACjB,QAAQ,EACR,KAAiB,EACjB,OAAO,EACP,OAAO,EACP,MAAM,CACP,CAAA;QAED,6BAA6B;QAC7B;;;;;UAKE;QAEF,IAAK,KAAK,CAAC,QAAQ,EAAG,CAAC;YACrB,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;gBAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACtC,qDAAqD;gBACrD,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,uBAAuB;oBACvB,mBAAmB,CACjB,QAAQ,EACR,QAAoB,EACpB,OAAO,EACP,OAAO,EACP,MAAM,CACP,CAAA;oBAED;;;;sBAIE;gBACJ,CAAC;gBAED,MAAM,gBAAgB,GAAG,2BAA2B,CAClD,OAAO,EACP,OAAO,EACP,OAAO,EACP,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CACT,CAAA;gBAED,aAAa,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAA;AACtB,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/interpolations/interpolateElement.d.ts

@@ -1,12 +1,10 @@
-import { InterpolatedContentTemplates } from './interpolateContentTemplates.js';
 import { Context, TagTemplate } from '../tag/Tag.class.js';
-import { Counts } from './interpolateTemplate.js';
-import { TagSupport } from '../tag/TagSupport.class.js';
+import { Counts, InterpolateComponentResult, Template } from './interpolateTemplate.js';
+import { Support } from '../tag/Support.class.js';
 export type InterpolateOptions = {
     counts: Counts;
 };
 /** Review elements within an element */
-export declare function interpolateElement(container: DocumentFragment, // element containing innerHTML to review interpolations
+export declare function interpolateElement(fragment: DocumentFragment, template: Template, // element containing innerHTML to review interpolations
 context: Context, // variables used to evaluate
-interpolatedTemplates: TagTemplate, ownerSupport: TagSupport, options: InterpolateOptions): InterpolatedContentTemplates;
-export declare function interpolateString(string: string): import("./interpolations.js").InterpolatedTemplates;
+interpolatedTemplates: TagTemplate, ownerSupport: Support, options: InterpolateOptions): InterpolateComponentResult[];

package/js/interpolations/interpolateElement.js

@@ -1,24 +1,20 @@
 import { interpolateAttributes } from './interpolateAttributes.js';
-import { interpolateToTemplates } from './interpolations.js';
 import { interpolateContentTemplates } from './interpolateContentTemplates.js';
-import { escapeSearch, variablePrefix } from '../tag/Tag.class.js';
 /** Review elements within an element */
-export function interpolateElement(container, // element containing innerHTML to review interpolations
+export function interpolateElement(fragment, template, // element containing innerHTML to review interpolations
 context, // variables used to evaluate
 interpolatedTemplates, ownerSupport, options) {
-    const clones = [];
     const tagComponents = [];
     const result = interpolatedTemplates.interpolation;
-    const template = container.children[0];
+    // const template = container.children[0] as HTMLTemplateElement
     const children = template.content.children;
     if (result.keys.length) {
-        const { clones: nextClones, tagComponents: nextTagComponents } = interpolateContentTemplates(context, ownerSupport, options, children);
-        clones.push(...nextClones);
+        const nextTagComponents = interpolateContentTemplates(context, ownerSupport, options, children, fragment);
         tagComponents.push(...nextTagComponents);
     }
     interpolateAttributes(template, context, ownerSupport);
     processChildrenAttributes(children, context, ownerSupport);
-    return { clones, tagComponents };
+    return tagComponents;
 }
 function processChildrenAttributes(children, context, ownerSupport) {
     for (let index = children.length - 1; index >= 0; --index) {
@@ -29,9 +25,4 @@ function processChildrenAttributes(children, context, ownerSupport) {
         }
     }
 }
-export function interpolateString(string) {
-    const result = interpolateToTemplates(string);
-    result.string = result.string.replace(escapeSearch, variablePrefix);
-    return result;
-}
 //# sourceMappingURL=interpolateElement.js.map

package/js/interpolations/interpolateElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateElement.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,EAAgC,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAC5G,OAAO,EAAwB,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AASxF,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAChC,SAA2B,EAAE,wDAAwD;AACrF,OAAgB,EAAE,6BAA6B;AAC/C,qBAAkC,EAClC,YAAwB,EACxB,OAA2B;IAE3B,MAAM,MAAM,GAAmB,EAAE,CAAA;IACjC,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,OAAO,EACP,YAAY,EACZ,OAAO,EACP,QAAQ,CACT,CAAA;QACD,MAAM,CAAC,IAAI,CAAE,GAAG,UAAU,CAAE,CAAA;QAC5B,aAAa,CAAC,IAAI,CAAE,GAAG,iBAAiB,CAAE,CAAA;IAC5C,CAAC;IAED,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IACtD,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IAE1D,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,CAAA;AAChC,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAwB,EACxB,OAAgB,EAChB,YAAwB;IAExB,KAAK,IAAI,KAAK,GAAC,QAAQ,CAAC,MAAM,GAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAEnD,IAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAClB,yBAAyB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;AACH,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/interpolations/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAA;AAS9E,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAChC,QAA0B,EAC1B,QAAkB,EAAE,wDAAwD;AAC5E,OAAgB,EAAE,6BAA6B;AAC/C,qBAAkC,EAClC,YAAqB,EACrB,OAA2B;IAE3B,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,MAAM,GAAG,qBAAqB,CAAC,aAAa,CAAA;IAClD,gEAAgE;IAChE,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAA;IAE1C,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,iBAAiB,GAAG,2BAA2B,CACnD,OAAO,EACP,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,QAAQ,CACT,CAAA;QACD,aAAa,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAA;IAC1C,CAAC;IAED,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IACtD,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IAE1D,OAAO,aAAa,CAAA;AACtB,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAwB,EACxB,OAAgB,EAChB,YAAqB;IAErB,KAAK,IAAI,KAAK,GAAC,QAAQ,CAAC,MAAM,GAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAEnD,IAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAClB,yBAAyB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;AACH,CAAC"}

package/js/interpolations/interpolateTemplate.d.ts

@@ -1,24 +1,21 @@
-import { Context, ElementBuildOptions } from '../tag/Tag.class.js';
-import { InsertBefore } from './InsertBefore.type.js';
+import { Context } from '../tag/Tag.class.js';
 import { InterpolateSubject } from '../tag/update/processFirstSubject.utils.js';
-import { TagSupport } from '../tag/TagSupport.class.js';
+import { AnySupport, Support } from '../tag/Support.class.js';
 export type Template = Element & {
-    clone?: any;
+    content: any;
 };
 export type InterpolateComponentResult = {
     subject: InterpolateSubject;
     insertBefore: Element | Text | Template;
-    ownerSupport: TagSupport;
+    ownerSupport: Support;
     variableName: string;
 };
-export declare function interpolateTemplate(insertBefore: Template, // <template end interpolate /> (will be removed)
-context: Context, // variable scope of {`__tagvar${index}`:'x'}
-ownerSupport: TagSupport, // Tag class
-counts: Counts): InterpolateComponentResult | undefined;
-export declare function subscribeToTemplate(insertBefore: InsertBefore, subject: InterpolateSubject, ownerSupport: TagSupport, counts: Counts): void;
 export type Counts = {
     added: number;
     removed: number;
 };
+export type ElementBuildOptions = {
+    counts: Counts;
+};
 /** This is the function that enhances elements such as [class.something] and [style.color] OR it fixes elements that alter innerHTML */
-export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions, context: Context, ownerSupport: TagSupport): void;
+export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions, context: Context, ownerSupport: AnySupport): void;

package/js/interpolations/interpolateTemplate.js

@@ -1,75 +1,9 @@
-import { variablePrefix } from '../tag/Tag.class.js';
 import { elementInitCheck } from './elementInitCheck.js';
-import { processFirstSubjectValue } from '../tag/update/processFirstSubjectValue.function.js';
-import { isTagArray, isTagComponent } from '../isInstance.js';
-import { scanTextAreaValue } from './scanTextAreaValue.function.js';
-import { updateExistingValue } from '../tag/update/updateExistingValue.function.js';
-import { swapInsertBefore } from '../tag/setTagPlaceholder.function.js';
-export function interpolateTemplate(insertBefore, // <template end interpolate /> (will be removed)
-context, // variable scope of {`__tagvar${index}`:'x'}
-ownerSupport, // Tag class
-counts) {
-    if (!insertBefore.hasAttribute('end')) {
-        return; // only care about <template end>
-    }
-    const variableName = insertBefore.getAttribute('id');
-    if (variableName?.substring(0, variablePrefix.length) !== variablePrefix) {
-        return; // ignore, not a tagVar
-    }
-    const existingSubject = context[variableName];
-    const isDynamic = isTagComponent(existingSubject._value) || isTagArray(existingSubject.value);
-    // process dynamics later
-    if (isDynamic) {
-        return {
-            variableName,
-            ownerSupport,
-            subject: existingSubject,
-            insertBefore
-        };
-    }
-    subscribeToTemplate(insertBefore, existingSubject, ownerSupport, counts);
-    return;
-}
-export function subscribeToTemplate(insertBefore, subject, ownerSupport, counts) {
-    let called = false;
-    const onValue = (value) => {
-        if (called) {
-            updateExistingValue(subject, value, ownerSupport, insertBefore);
-            return;
-        }
-        const templater = value;
-        processFirstSubjectValue(templater, subject, insertBefore, ownerSupport, {
-            counts: { ...counts },
-        });
-        called = true;
-    };
-    let mutatingCallback = onValue;
-    const callback = (value) => mutatingCallback(value);
-    const sub = subject.subscribe(callback);
-    // on subscribe, the Subject did NOT emit immediately. Lets pull the template off the document
-    if (insertBefore.parentNode) {
-        const clone = subject.clone = swapInsertBefore(insertBefore);
-        mutatingCallback = v => {
-            const parentNode = clone.parentNode;
-            parentNode.insertBefore(insertBefore, clone);
-            parentNode.removeChild(clone);
-            delete subject.clone;
-            mutatingCallback = onValue; // all future calls will just produce value
-            onValue(v); // calls for rending
-        };
-    }
-    ownerSupport.global.subscriptions.push(sub);
-}
 /** This is the function that enhances elements such as [class.something] and [style.color] OR it fixes elements that alter innerHTML */
 export function afterElmBuild(elm, options, context, ownerSupport) {
     if (!elm.getAttribute) {
         return;
     }
-    // Elements that alter innerHTML
-    const tagName = elm.nodeName; // elm.tagName
-    if (tagName === 'TEXTAREA') {
-        scanTextAreaValue(elm, context, ownerSupport);
-    }
     let diff = options.counts.added;
     diff = elementInitCheck(elm, options.counts) - diff;
     const hasFocusFun = elm.focus;

package/js/interpolations/interpolateTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolateTemplate.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAGxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAA;AAC7F,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAA;AAGnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAUvE,MAAM,UAAU,mBAAmB,CACjC,YAAsB,EAAE,iDAAiD;AACzE,OAAgB,EAAE,6CAA6C;AAC/D,YAAwB,EAAE,YAAY;AACtC,MAAc;IAEd,IAAK,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAG,CAAC;QACxC,OAAM,CAAC,iCAAiC;IAC1C,CAAC;IAED,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IACpD,IAAG,YAAY,EAAE,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,cAAc,EAAE,CAAC;QACxE,OAAM,CAAC,uBAAuB;IAChC,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,cAAc,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAE7F,yBAAyB;IACzB,IAAG,SAAS,EAAE,CAAC;QACb,OAAO;YACL,YAAY;YACZ,YAAY;YACZ,OAAO,EAAE,eAAe;YACxB,YAAY;SACb,CAAA;IACH,CAAC;IAED,mBAAmB,CACjB,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,MAAM,CACP,CAAA;IAED,OAAM;AACR,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,YAA0B,EAC1B,OAA2B,EAC3B,YAAwB,EACxB,MAAc;IAEd,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,MAAM,OAAO,GAAG,CAAC,KAAoB,EAAE,EAAE;QACvC,IAAG,MAAM,EAAE,CAAC;YACV,mBAAmB,CACjB,OAAO,EACP,KAAK,EACL,YAAY,EACZ,YAAY,CACb,CAAA;YACD,OAAM;QACR,CAAC;QAED,MAAM,SAAS,GAAG,KAAwB,CAAA;QAE1C,wBAAwB,CACtB,SAAS,EACT,OAAO,EACP,YAAY,EACZ,YAAY,EACZ;YACE,MAAM,EAAE,EAAC,GAAG,MAAM,EAAC;SACpB,CACF,CAAA;QAED,MAAM,GAAG,IAAI,CAAA;IACf,CAAC,CAAA;IAED,IAAI,gBAAgB,GAAG,OAAO,CAAA;IAE9B,MAAM,QAAQ,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,QAAe,CAAC,CAAA;IAE9C,8FAA8F;IAC9F,IAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;QAC5D,gBAAgB,GAAG,CAAC,CAAC,EAAE;YACrB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAwB,CAAA;YACjD,UAAU,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;YAC5C,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,OAAO,CAAC,KAAK,CAAA;YACpB,gBAAgB,GAAG,OAAO,CAAA,CAAC,2CAA2C;YACtE,OAAO,CAAC,CAAC,CAAC,CAAA,CAAC,oBAAoB;QACjC,CAAC,CAAA;IACH,CAAC;IAED,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7C,CAAC;AAOD,wIAAwI;AACxI,MAAM,UAAU,aAAa,CAC3B,GAAwB,EACxB,OAA4B,EAC5B,OAAgB,EAChB,YAAwB;IAExB,IAAG,CAAE,GAAe,CAAC,YAAY,EAAE,CAAC;QAClC,OAAM;IACR,CAAC;IAED,gCAAgC;IAChC,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAA,CAAC,cAAc;IAC3C,IAAG,OAAO,KAAG,UAAU,EAAE,CAAC;QACxB,iBAAiB,CAAC,GAA0B,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IACtE,CAAC;IAED,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA;IAC/B,IAAI,GAAG,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAEnD,MAAM,WAAW,GAAI,GAAW,CAAC,KAAK,CAAA;IACtC,IAAG,WAAW,EAAE,CAAC;QACf,IAAI,GAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;YACzC,GAAW,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;QAED,IAAI,GAAW,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,GAAW,CAAC,MAAM,EAAE,CAAA;QACvB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAI,GAAe,CAAC,QAA0B,CAAA;IAC5D,IAAG,QAAQ,EAAE,CAAC;QACZ,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;YAC7B,MAAM,UAAU,GAAG;gBACjB,GAAG,OAAO;gBACX,MAAM,EAAE,OAAO,CAAC,MAAM;aACtB,CAAA;YAED,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"interpolateTemplate.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAuBxD,wIAAwI;AACxI,MAAM,UAAU,aAAa,CAC3B,GAAwB,EACxB,OAA4B,EAC5B,OAAgB,EAChB,YAAwB;IAExB,IAAI,CAAE,GAAe,CAAC,YAAY,EAAE,CAAC;QACnC,OAAM;IACR,CAAC;IAED,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA;IAC/B,IAAI,GAAG,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAEnD,MAAM,WAAW,GAAI,GAAW,CAAC,KAAK,CAAA;IACtC,IAAI,WAAW,EAAE,CAAC;QAChB,IAAK,GAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1C,GAAW,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;QAED,IAAK,GAAW,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,GAAW,CAAC,MAAM,EAAE,CAAA;QACvB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAI,GAAe,CAAC,QAA0B,CAAA;IAC5D,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;YAC7B,MAAM,UAAU,GAAG;gBACjB,GAAG,OAAO;gBACV,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAA;YAED,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QACzD,CAAC;IACH,CAAC;AACH,CAAC"}

package/js/interpolations/interpolations.d.ts

@@ -1,7 +1,4 @@
-export declare const interpolateReplace: RegExp;
 export type InterpolatedTemplates = {
     string: string;
     keys: string[];
 };
-/** replaces ${x} with <template id="x-start"></template><template id="x-end"></template> */
-export declare function interpolateToTemplates(template: string): InterpolatedTemplates;

package/js/interpolations/interpolations.js

@@ -1,18 +1,2 @@
-// support arrow functions in attributes
-export const interpolateReplace = /(?:<[^>]*?(?:(?:\s+\w+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^>\s]+)))*\s*)\/?>)|({__tagvar[^}]+})/g;
-/** replaces ${x} with <template id="x-start"></template><template id="x-end"></template> */
-export function interpolateToTemplates(template) {
-    const keys = [];
-    const string = template.replace(interpolateReplace, (match, expression) => {
-        if (match.startsWith('<')) {
-            // If the match is an HTML tag, don't replace
-            return match;
-        }
-        const noBraces = expression.substring(1, expression.length - 1);
-        const id = noBraces;
-        keys.push(id);
-        return `<template interpolate end id="${id}"></template>`;
-    });
-    return { string, keys };
-}
+export {};
 //# sourceMappingURL=interpolations.js.map

package/js/interpolations/interpolations.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolations.js","sourceRoot":"","sources":["../../ts/interpolations/interpolations.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,4FAA4F,CAAA;AAU9H,4FAA4F;AAC5F,MAAM,UAAU,sBAAsB,CACpC,QAAgB;IAEhB,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACxE,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,6CAA6C;YAC7C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAC,CAAC,CAAC,CAAA;QAC7D,MAAM,EAAE,GAAG,QAAQ,CAAA;QACnB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACb,OAAO,iCAAiC,EAAE,eAAe,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AACzB,CAAC"}
+{"version":3,"file":"interpolations.js","sourceRoot":"","sources":["../../ts/interpolations/interpolations.ts"],"names":[],"mappings":""}

package/js/interpolations/optimizers/ObjectNode.types.d.ts

@@ -0,0 +1,31 @@
+type ObjectNode = {
+    nodeName: string;
+};
+export type ObjectText = ObjectNode & {
+    textContent: string;
+    value?: unknown;
+    domElement?: Text;
+    marker?: Text;
+};
+export type Attribute = [string, any?] | [any];
+export type ObjectElement = ObjectNode & {
+    attributes: Attribute[];
+    value?: unknown;
+    children?: ObjectChildren;
+    domElement?: HTMLElement;
+    marker?: Text;
+};
+export type ObjectChildren = (ObjectText | ObjectElement)[];
+export type DomObjectText = ObjectText & {
+    textContent: string;
+    domElement: Text;
+    marker: Text;
+};
+export type DomObjectElement = ObjectElement & {
+    attributes: [string, any][];
+    children?: DomObjectChildren;
+    domElement: HTMLElement;
+    marker: Text;
+};
+export type DomObjectChildren = (DomObjectText | DomObjectElement)[];
+export {};

package/js/interpolations/optimizers/ObjectNode.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ObjectNode.types.js.map

package/js/interpolations/optimizers/ObjectNode.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObjectNode.types.js","sourceRoot":"","sources":["../../../ts/interpolations/optimizers/ObjectNode.types.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,4 @@
+import { DomObjectElement, ObjectElement, ObjectText } from "./ObjectNode.types.js";
+export declare function htmlInterpolationToDomMeta(strings: string[], values: unknown[]): (ObjectText | DomObjectElement)[];
+export declare function exchangeParsedForValues(parsedElements: (ObjectElement | ObjectText)[], values: unknown[]): (ObjectText | ObjectElement)[];
+export declare function balanceArrayByArrays(results: unknown[], strings: string[], values: unknown[]): void;