taggedjs 2.1.2 → 2.3.25

package/js/interpolateContentTemplates.js

@@ -1,42 +1,38 @@
 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) {
-    if (!element.children || element.tagName === 'TEMPLATE') {
-        return; // done
+export function interpolateContentTemplates(element, // <div><div></div><template tag-wrap="22">...</template></div>
+variable, tag, options, children) {
+    if (!children || element.tagName === 'TEMPLATE') {
+        return []; // done
     }
     const counts = {
         added: 0,
         removed: 0,
     };
-    const children = new Array(...element.children);
-    children.forEach((child, index) => {
-        interpolateChild(child, index, children);
+    const clones = [];
+    const childArray = new Array(...children);
+    if (element.tagName === 'TEXTAREA') {
+        scanTextAreaValue(element);
+    }
+    childArray.forEach(child => {
+        const nextClones = interpolateTemplate(child, variable, tag, counts, options);
+        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);
+                    interpolateTemplate(subChild, variable, tag, counts, options);
                 }
-                interpolateContentTemplates(subChild, variable, ownerTag);
+                const nextClones = interpolateContentTemplates(subChild, variable, tag, options, subChild.children);
+                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 isRenderEndTemplate(child) {
     const isTemplate = child.tagName === 'TEMPLATE';
@@ -44,4 +40,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/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":"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,QAAa,EACb,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,MAAM,MAAM,GAAW;QACrB,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,CAAC;KACX,CAAA;IACD,MAAM,MAAM,GAAW,EAAE,CAAA;IAEzB,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,KAAK,CAAC,EAAE;QACzB,MAAM,UAAU,GAAG,mBAAmB,CACpC,KAAiB,EACjB,QAAQ,EACR,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,QAAQ,CAAC,EAAE;gBAC1B,IAAK,mBAAmB,CAAC,QAAQ,CAAC,EAAG,CAAC;oBACpC,mBAAmB,CAAC,QAAoB,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;gBAC3E,CAAC;gBAED,MAAM,UAAU,GAAG,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBACnG,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"}

package/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 { Context, Tag, TagTemplate } from "./Tag.class.js";
+import { Clones } from "./Clones.type.js";
+export type InterpolateOptions = {
+    /** make the element go on document */
+    forceElement?: boolean;
 };
+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;

package/js/interpolateElement.js

@@ -2,34 +2,38 @@ 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);
+interpolatedTemplates, tagOwner, options) {
+    const clones = [];
+    const result = interpolatedTemplates.interpolation; // interpolateElementChild(element)
+    // const result = interpolateElementChild(element)
+    const template = element.children[0];
+    const children = template.content.children;
     if (result.keys.length) {
-        interpolateContentTemplates(element, context, ownerTag);
+        const nextClones = interpolateContentTemplates(element, context, tagOwner, options, children);
+        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, tagOwner);
+    processChildrenAttributes(children, context, tagOwner);
+    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);
-    result.string = result.string.replace(escapeSearch, variablePrefix);
+function interpolateElementChild(child) {
+    const result = interpolateString(child.innerHTML);
     child.innerHTML = result.string;
     return result;
 }
+export function interpolateString(string) {
+    const result = interpolateToTemplates(string);
+    result.string = result.string.replace(escapeSearch, variablePrefix);
+    return result;
+}
 //# sourceMappingURL=interpolateElement.js.map

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,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,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAQxF,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,CAAC,mCAAmC;IACtF,kDAAkD;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,gDAAgD;AAChD,SAAS,uBAAuB,CAC9B,KAAc;IAEd,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACjD,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;IAC/B,OAAO,MAAM,CAAA;AACf,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"}

package/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;

package/js/interpolateTemplate.js

@@ -1,98 +1,37 @@
-import { buildItemTagMap } from "./render.js";
-import { Tag, variablePrefix } from "./Tag.class.js";
-import { Subject } from "./Subject.js";
-import { processTagArray } from "./processTagArray.js";
-import { getTagSupport } from "./getTagSupport.js";
-import { deepClone, deepEqual } from "./deepFunctions.js";
-import { config as providers } from "./providers.js";
+import { variablePrefix } from "./Tag.class.js";
 import { elementInitCheck } from "./elementInitCheck.js";
-import { runBeforeRender } from "./tagRunner.js";
-import { TemplaterResult } from "./tag.js";
+import { processSubjectValue } from "./processSubjectValue.function.js";
 export function interpolateTemplate(template, // <template end interpolate /> (will be removed)
-context, // variable scope of {`__tagVar${index}`:'x'}
-ownerTag, // Tag class
-counts) {
+context, // variable scope of {`__tagvar${index}`:'x'}
+tag, // Tag class
+counts, // {added:0, removed:0}
+options) {
+    const clones = [];
     if (!template.hasAttribute('end')) {
-        return; // only care about starts
+        return clones; // only care about starts
     }
     const variableName = template.getAttribute('id');
     if (variableName?.substring(0, variablePrefix.length) !== variablePrefix) {
-        return; // ignore, not a tagVar
+        return clones; // ignore, not a tagVar
     }
     const result = context[variableName];
-    if (result instanceof Subject) {
-        const callback = (templateNewValue) => {
-            processSubjectValue(templateNewValue, result, template, ownerTag, counts);
-            setTimeout(() => {
-                counts.added = 0; // reset
-                counts.removed = 0; // reset
-            }, 0);
-        };
-        const sub = result.subscribe(callback);
-        ownerTag.cloneSubs.push(sub);
-        return;
-    }
-    const clone = updateBetweenTemplates(result, template.clone || template);
-    ownerTag.clones.push(clone);
-    template.clone = clone;
-    return;
-}
-/**
- *
- * @param {*} value
- * @param {*} result
- * @param {*} template
- * @param {Tag} ownerTag
- * @param {{added: number, removed: number}} counts
- * @returns
- */
-function processSubjectValue(value, result, // could be tag via result.tag
-template, // <template end interpolate /> (will be removed)
-ownerTag, counts) {
-    if (value instanceof Tag) {
-        // first time seeing this tag?
-        if (!value.tagSupport) {
-            value.tagSupport = getTagSupport();
-            value.tagSupport.mutatingRender = ownerTag.tagSupport.mutatingRender;
-            value.tagSupport.oldest = value.tagSupport.oldest || value;
-            ownerTag.children.push(value);
-            value.ownerTag = ownerTag;
+    // const isSubject = isSubjectInstance(result)
+    let isForceElement = options.forceElement;
+    const callback = (templateNewValue) => {
+        const { clones } = processSubjectValue(templateNewValue, result, template, tag, { counts, forceElement: isForceElement });
+        if (isForceElement) {
+            isForceElement = false; // only can happen once
         }
-        // value.tagSupport.newest = value
-        processTagResult(value, result, // Function will attach result.tag
-        template, { counts });
-        return;
-    }
-    // *for map
-    if (value instanceof Array && value.every(x => x instanceof Tag)) {
-        return processTagArray(result, value, template, ownerTag, counts);
-    }
-    if (isTagComponent(value)) {
-        return processSubjectComponent(value, result, template, ownerTag, counts);
-    }
-    // *if processing WAS a tag BUT NOW its some other non-tag value
-    if (result.tag) {
-        // put the template back
-        const lastFirstChild = template.clone || template; // result.tag.clones[0] // template.lastFirstChild
-        lastFirstChild.parentNode.insertBefore(template, lastFirstChild);
-        const stagger = counts.removed;
-        const animated = result.tag.destroy(stagger);
-        counts.removed = stagger + animated;
-        delete result.tag;
-        const clone = updateBetweenTemplates(value, lastFirstChild // ✅ this will be removed
-        ); // the template will be remove in here
-        template.clone = clone;
-        return;
-    }
-    const before = template.clone || template; // Either the template is on the doc OR its the first element we last put on doc
-    // Processing of regular values
-    const clone = updateBetweenTemplates(value, before);
-    template.clone = clone;
-    const oldPos = ownerTag.clones.indexOf(before);
-    if (oldPos >= 0 && !ownerTag.clones.includes(clone) && !before.parentNode) {
-        ownerTag.clones.splice(oldPos, 1);
-        ownerTag.clones.push(clone);
-    }
+        clones.push(...clones);
+        // TODO: See if we can remove
+        setTimeout(() => {
+            counts.added = 0; // reset
+            counts.removed = 0; // reset
+        }, 0);
+    };
+    const sub = result.subscribe(callback);
+    tag.cloneSubs.push(sub);
+    return clones;
 }
 // Function to update the value of x
 export function updateBetweenTemplates(value, lastFirstChild) {
@@ -106,157 +45,20 @@ export function updateBetweenTemplates(value, lastFirstChild) {
     parent.insertBefore(textNode, lastFirstChild);
     /* remove existing nodes */
     parent.removeChild(lastFirstChild);
-    return textNode;
-}
-/** Returns {clones:[], subs:[]} */
-export function processTagResult(tag, result, // used for recording past and current value
-insertBefore, // <template end interpolate />
-{ index, counts, }) {
-    const template = tag.getTemplate();
-    // *for
-    if (index !== undefined) {
-        const existing = result.lastArray[index];
-        if (existing?.tag.isLikeTag(tag)) {
-            existing.tag.updateByTag(tag);
-            return;
-        }
-        const lastFirstChild = insertBefore; // tag.clones[0] // insertBefore.lastFirstChild
-        const clones = buildItemTagMap(tag, template, lastFirstChild);
-        clones.forEach(clone => afterElmBuild(clone, counts));
-        result.lastArray.push({
-            tag, index
-        });
-        return;
+    if (lastFirstChild.nodeName === 'TEMPLATE') {
+        lastFirstChild.setAttribute('removedAt', Date.now().toString());
     }
-    // *if appears we already have seen
-    if (result.tag) {
-        // are we just updating an if we already had?
-        if (result.tag.isLikeTag(tag)) {
-            // components
-            if (result instanceof Function) {
-                const newTag = result(result.tag.tagSupport);
-                result.tag.updateByTag(newTag);
-                return;
-            }
-            result.tag.updateByTag(tag);
-            return;
-        }
-    }
-    // *if just now appearing to be a Tag
-    const before = insertBefore.clone || insertBefore;
-    const clones = buildItemTagMap(tag, template, before);
-    clones.forEach(clone => afterElmBuild(clone, counts));
-    result.tag = tag; // let reprocessing know we saw this previously as an if
-    return;
-}
-export function isTagComponent(value) {
-    return value instanceof TemplaterResult;
-}
-function processSubjectComponent(value, result, template, ownerTag, counts) {
-    if (value.tagged !== true) {
-        let name = value.name || value.constructor?.name;
-        if (name === 'Function') {
-            name = undefined;
-        }
-        const error = new Error(`Not a tag component. Wrap your function with tag(). Example tag(props => html\`\`) on component:\n\n${name || value.toString().substring(0, 120)}\n\n`);
-        throw error;
-    }
-    /** @type {TagSupport} */
-    const tagSupport = result.tagSupport || getTagSupport(value);
-    tagSupport.mutatingRender = () => {
-        const preRenderCount = tagSupport.renderCount;
-        // Is this NOT my first render
-        if (result.tag) {
-            providersChangeCheck(result.tag);
-            // When the providers were checked, a render to myself occurred and I do not need to re-render again
-            if (preRenderCount !== tagSupport.renderCount) {
-                return tagSupport.newest;
-            }
-            const hasPropsChanged = tagSupport.hasPropChanges(value.props, value.newProps, result.tag.tagSupport.templater.props);
-            if (!hasPropsChanged) {
-                tagSupport.newest = value.redraw(value.newProps); // No change detected, just redraw me only
-                return tagSupport.newest;
-            }
-        }
-        // draw to my parent
-        const newest = tagSupport.newest = ownerTag.tagSupport.render();
-        return newest;
-    };
-    const templater = value;
-    let tag = templater.newest;
-    providers.ownerTag = ownerTag;
-    const isFirstTime = !tag;
-    runBeforeRender(tagSupport, tag);
-    if (isFirstTime) {
-        tag = templater.wrapper();
-        tag.tagSupport = tagSupport;
-        tag.afterRender();
-        templater.oldest = tag;
-        tagSupport.oldest = tag;
-        value.oldest = tag;
-    }
-    templater.newest = tag;
-    tag.ownerTag = ownerTag;
-    tag.ownerTag = ownerTag;
-    ownerTag.children.push(tag);
-    tag.setSupport(tagSupport);
-    processTagResult(tag, result, // The element set here will be removed from document
-    template, // <template end interpolate /> (will be removed)
-    {
-        counts,
-    });
-    return;
+    return textNode;
 }
-function afterElmBuild(elm, counts) {
+export function afterElmBuild(elm, options) {
     if (!elm.getAttribute) {
         return;
     }
-    elementInitCheck(elm, counts);
-    if (elm.children) {
-        new Array(...elm.children).forEach(child => afterElmBuild(child, counts));
+    if (!options.forceElement) {
+        elementInitCheck(elm, options.counts);
     }
-}
-function providersChangeCheck(tag) {
-    const providersWithChanges = tag.providers.filter(provider => {
-        return !deepEqual(provider.instance, provider.clone);
-    });
-    // reset clones
-    providersWithChanges.forEach(provider => {
-        const appElement = tag.getAppElement();
-        handleProviderChanges(appElement, provider);
-        provider.clone = deepClone(provider.instance);
-    });
-}
-/**
- *
- * @param {Tag} appElement
- * @param {Provider} provider
- */
-function handleProviderChanges(appElement, provider) {
-    const tagsWithProvider = getTagsWithProvider(appElement, provider);
-    tagsWithProvider.forEach(({ tag, renderCount, provider }) => {
-        if (renderCount === tag.tagSupport.renderCount) {
-            provider.clone = deepClone(provider.instance);
-            tag.tagSupport.render();
-        }
-    });
-}
-/**
- *
- * @param {Tag} appElement
- * @param {Provider} provider
- * @returns {{tag: Tag, renderCount: numer, provider: Provider}[]}
- */
-function getTagsWithProvider(tag, provider, memory = []) {
-    const hasProvider = tag.providers.find(xProvider => xProvider.constructMethod === provider.constructMethod);
-    if (hasProvider) {
-        memory.push({
-            tag,
-            renderCount: tag.tagSupport.renderCount,
-            provider: hasProvider
-        });
+    if (elm.children) {
+        new Array(...elm.children).forEach(child => afterElmBuild(child, options));
     }
-    tag.children.forEach(child => getTagsWithProvider(child, provider, memory));
-    return memory;
 }
 //# sourceMappingURL=interpolateTemplate.js.map

package/js/interpolateTemplate.js.map

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

package/js/interpolations.d.ts

@@ -1,6 +1,7 @@
 export declare const interpolateReplace: RegExp;
-/** replaces ${x} with <template id="x-start"></template><template id="x-end"></template> */
-export declare function interpolateToTemplates(template: string): {
+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.js

@@ -1,4 +1,5 @@
-export const interpolateReplace = /(?:<[^>]*>)|({__tagVar[^}]+})/g;
+// 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 = [];

package/js/interpolations.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolations.js","sourceRoot":"","sources":["../ts/interpolations.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,gCAAgC,CAAA;AAElE,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.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"}

package/js/isInstance.d.ts

@@ -0,0 +1,6 @@
+import { SubjectLike } from "./Subject.js";
+import { Tag } from "./Tag.class.js";
+import { TemplaterResult } from "./templater.utils.js";
+export declare function isTagComponent(value?: TemplaterResult): boolean;
+export declare function isTagInstance(tag?: Tag | unknown): boolean;
+export declare function isSubjectInstance(subject?: SubjectLike): Boolean;

package/js/isInstance.js

@@ -0,0 +1,10 @@
+export function isTagComponent(value) {
+    return value?.isTemplater === true;
+}
+export function isTagInstance(tag) {
+    return tag?.isTag === true;
+}
+export function isSubjectInstance(subject) {
+    return (subject?.isSubject === true || subject?.subscribe) ? true : false; // subject?.isSubject === true || 
+}
+//# sourceMappingURL=isInstance.js.map

package/js/isInstance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isInstance.js","sourceRoot":"","sources":["../ts/isInstance.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,cAAc,CAAC,KAAuB;IACpD,OAAO,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAmB;IAC/C,OAAQ,GAAW,EAAE,KAAK,KAAK,IAAI,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAqB;IAErB,OAAO,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,IAAI,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA,CAAC,kCAAkC;AAC9G,CAAC"}

package/js/js/Clones.type.d.ts

@@ -0,0 +1 @@
+export type Clones = (Element | Text | ChildNode)[];

package/js/js/Clones.type.js

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

package/js/js/Clones.type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Clones.type.js","sourceRoot":"","sources":["../ts/Clones.type.ts"],"names":[],"mappings":""}

package/js/js/Props.d.ts

@@ -0,0 +1 @@
+export type Props = unknown;

package/js/js/Props.js

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

package/js/js/Props.js.map

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