taggedjs 2.4.2 → 2.4.12

package/js/interpolateTemplate.d.ts

@@ -1,17 +1,32 @@
-import { Context, ElementBuildOptions, Tag } from "./Tag.class.js";
-import { InterpolateOptions } from "./interpolateElement.js";
-import { Clones } from "./Clones.type.js";
+import { Context, ElementBuildOptions, Tag } from "./Tag.class";
+import { InterpolateOptions } from "./interpolateElement";
+import { Clones } from "./Clones.type";
+import { InterpolateSubject } from "./processSubjectValue.function";
 export type Template = Element & {
     clone?: any;
 };
-export declare function interpolateTemplate(template: Template, // <template end interpolate /> (will be removed)
+export type InterpolateComponentResult = {
+    subject: InterpolateSubject;
+    insertBefore: Element | Text | Template;
+    ownerTag: Tag;
+    variableName: string;
+};
+export type InterpolateTemplateResult = {
+    clones: Clones;
+    tagComponent?: InterpolateComponentResult;
+};
+export declare function interpolateTemplate(insertBefore: Template, // <template end interpolate /> (will be removed)
 context: Context, // variable scope of {`__tagvar${index}`:'x'}
-tag: Tag, // Tag class
+ownerTag: Tag, // Tag class
 counts: Counts, // used for animation stagger computing
-options: InterpolateOptions): Clones;
+options: InterpolateOptions): InterpolateTemplateResult;
+export declare function subscribeToTemplate(insertBefore: Element | Text | Template, subject: InterpolateSubject, ownerTag: Tag, counts: Counts, // used for animation stagger computing
+{ isForceElement }: {
+    isForceElement?: boolean;
+}): void;
 export declare function updateBetweenTemplates(value: string | undefined | boolean | number, lastFirstChild: Element | Text): Text;
 export type Counts = {
     added: number;
     removed: number;
 };
-export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions): void;
+export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions, context: Context, ownerTag: Tag): void;

package/js/interpolateTemplate.js

@@ -1,35 +1,68 @@
-import { variablePrefix } from "./Tag.class.js";
-import { elementInitCheck } from "./elementInitCheck.js";
-import { processSubjectValue } from "./processSubjectValue.function.js";
-export function interpolateTemplate(template, // <template end interpolate /> (will be removed)
+import { variablePrefix } from "./Tag.class";
+import { elementInitCheck } from "./elementInitCheck";
+import { processSubjectValue } from "./processSubjectValue.function";
+import { isTagArray, isTagComponent } from "./isInstance";
+import { scanTextAreaValue } from "./scanTextAreaValue.function";
+import { updateExistingValue } from "./updateExistingValue.function";
+export function interpolateTemplate(insertBefore, // <template end interpolate /> (will be removed)
 context, // variable scope of {`__tagvar${index}`:'x'}
-tag, // Tag class
+ownerTag, // Tag class
 counts, // used for animation stagger computing
 options) {
+    // TODO: THe clones array is useless here
     const clones = [];
-    if (!template.hasAttribute('end')) {
-        return clones; // only care about starts
+    if (!insertBefore.hasAttribute('end')) {
+        return { clones }; // only care about <template end>
     }
-    const variableName = template.getAttribute('id');
+    const variableName = insertBefore.getAttribute('id');
     if (variableName?.substring(0, variablePrefix.length) !== variablePrefix) {
-        return clones; // ignore, not a tagVar
+        return { clones }; // ignore, not a tagVar
+    }
+    const existingSubject = context[variableName];
+    const isDynamic = isTagComponent(existingSubject.value) || isTagArray(existingSubject.value);
+    // process dynamics later
+    if (isDynamic) {
+        return {
+            clones,
+            tagComponent: {
+                variableName,
+                ownerTag,
+                subject: existingSubject,
+                insertBefore
+            }
+        };
     }
-    const result = context[variableName];
     let isForceElement = options.forceElement;
-    const callback = (templateNewValue) => {
-        const { clones } = processSubjectValue(templateNewValue, result, template, tag, {
-            // counts,
-            counts: { added: counts.added, removed: counts.removed },
+    subscribeToTemplate(insertBefore, existingSubject, ownerTag, counts, { isForceElement });
+    return { clones };
+}
+export function subscribeToTemplate(insertBefore, subject, ownerTag, counts, // used for animation stagger computing
+{ isForceElement }) {
+    let called = false;
+    const callback = (value) => {
+        // const orgInsert = insertBefore
+        const clone = subject.clone;
+        if (clone && clone.parentNode) {
+            insertBefore = clone;
+        }
+        if (called) {
+            updateExistingValue(subject, value, ownerTag, insertBefore);
+            return;
+        }
+        processSubjectValue(value, subject, insertBefore, ownerTag, {
+            counts: { ...counts },
             forceElement: isForceElement,
         });
         if (isForceElement) {
             isForceElement = false; // only can happen once
         }
-        clones.push(...clones);
+        // ownerTag.clones.push(...clones)
+        // ownerTag.clones.push(...nextClones)
+        // clones.push(...nextClones)
+        called = true;
     };
-    const sub = result.subscribe(callback);
-    tag.cloneSubs.push(sub);
-    return clones;
+    const sub = subject.subscribe(callback);
+    ownerTag.cloneSubs.push(sub);
 }
 // Function to update the value of x
 export function updateBetweenTemplates(value, lastFirstChild) {
@@ -45,24 +78,29 @@ export function updateBetweenTemplates(value, lastFirstChild) {
     parent.removeChild(lastFirstChild);
     return textNode;
 }
-export function afterElmBuild(elm, options) {
+export function afterElmBuild(elm, options, context, ownerTag) {
     if (!elm.getAttribute) {
         return;
     }
-    let diff = options.counts.added;
-    if (!options.forceElement) {
-        diff = elementInitCheck(elm, options.counts) - diff;
+    const tagName = elm.nodeName; // elm.tagName
+    if (tagName === 'TEXTAREA') {
+        scanTextAreaValue(elm, context, ownerTag);
     }
+    let diff = options.counts.added;
+    diff = elementInitCheck(elm, options.counts) - diff;
     if (elm.children) {
+        /*
         const subCounts = {
-            added: options.counts.added, // - diff,
-            removed: options.counts.removed,
-        };
+          added: options.counts.added, // - diff,
+          removed: options.counts.removed,
+        }
+        */
         new Array(...elm.children).forEach((child, index) => {
-            return afterElmBuild(child, {
+            const subOptions = {
                 ...options,
                 counts: options.counts,
-            });
+            };
+            return afterElmBuild(child, subOptions, context, ownerTag);
         });
     }
 }

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/isInstance.d.ts

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

package/js/isInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"isInstance.js","sourceRoot":"","sources":["../ts/isInstance.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,cAAc,CAAC,KAAiC;IAC9D,OAAQ,KAAyB,EAAE,WAAW,KAAK,IAAI,CAAA;AACzD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAmB;IAC/C,OAAQ,GAAW,EAAE,KAAK,KAAK,IAAI,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAA2B;IAE3B,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;AAED,MAAM,UAAU,UAAU,CAAC,KAAU;IACnC,OAAO,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;AACrE,CAAC"}
+{"version":3,"file":"isInstance.js","sourceRoot":"","sources":["../ts/isInstance.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,cAAc,CAAC,KAAiC;IAC9D,OAAQ,KAAyB,EAAE,WAAW,KAAK,IAAI,CAAA;AACzD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAA+B;IAC3D,OAAQ,GAAuB,EAAE,KAAK,KAAK,IAAI,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAA2B;IAE3B,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;AAED,MAAM,UAAU,UAAU,CAAC,KAAU;IACnC,OAAO,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;AACrE,CAAC"}

package/js/isLikeTags.function.d.ts

@@ -0,0 +1,2 @@
+import { Tag } from "./Tag.class";
+export declare function isLikeTags(tag0: Tag, tag1: Tag): Boolean;

package/js/isLikeTags.function.js

@@ -0,0 +1,30 @@
+export function isLikeTags(tag0, tag1) {
+    if (tag0.strings.length !== tag1.strings.length) {
+        return false;
+    }
+    const everyStringMatched = tag0.strings.every((string, index) => tag1.strings[index] === string);
+    if (!everyStringMatched) {
+        return false;
+    }
+    const valuesLengthsMatch = tag0.values.length === tag1.values.length;
+    if (!valuesLengthsMatch) {
+        return false;
+    }
+    const allVarsMatch = tag1.values.every((value, index) => {
+        const compareTo = tag0.values[index];
+        const isFunctions = value instanceof Function && compareTo instanceof Function;
+        if (isFunctions) {
+            const stringMatch = value.toString() === compareTo.toString();
+            if (stringMatch) {
+                return true;
+            }
+            return false;
+        }
+        return true; // deepEqual(value, compareTo)
+    });
+    if (allVarsMatch) {
+        return true;
+    }
+    return false;
+}
+//# sourceMappingURL=isLikeTags.function.js.map

package/js/isLikeTags.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isLikeTags.function.js","sourceRoot":"","sources":["../ts/isLikeTags.function.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CAAC,IAAS,EAAE,IAAS;IAC7C,IAAG,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,CAAA;IAC/F,IAAG,CAAC,kBAAkB,EAAE,CAAC;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IACpE,IAAG,CAAC,kBAAkB,EAAE,CAAC;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAC,EAAE;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACpC,MAAM,WAAW,GAAG,KAAK,YAAY,QAAQ,IAAI,SAAS,YAAY,QAAQ,CAAA;QAE9E,IAAG,WAAW,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAA;YAC7D,IAAG,WAAW,EAAE,CAAC;gBACf,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,IAAI,CAAA,CAAC,8BAA8B;IAC5C,CAAC,CAAC,CAAA;IAEF,IAAG,YAAY,EAAE,CAAC;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/js/onDestroy.js

@@ -1,14 +1,14 @@
-import { setUse } from "./setUse.function.js";
+import { setUse } from "./setUse.function";
 /** When undefined, it means a tag is being built for the first time so do run destroy(s) */
 let destroyCurrentTagSupport;
 export function onDestroy(callback) {
-    destroyCurrentTagSupport.memory.destroyCallback = callback;
+    destroyCurrentTagSupport.templater.global.destroyCallback = callback;
 }
 setUse({
     beforeRender: tagSupport => destroyCurrentTagSupport = tagSupport,
     beforeRedraw: tagSupport => destroyCurrentTagSupport = tagSupport,
     beforeDestroy: (tagSupport, tag) => {
-        const callback = tagSupport.memory.destroyCallback;
+        const callback = tagSupport.templater.global.destroyCallback;
         if (callback) {
             callback();
         }

package/js/onDestroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"onDestroy.js","sourceRoot":"","sources":["../ts/onDestroy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAI7C,4FAA4F;AAC5F,IAAI,wBAAoC,CAAA;AAExC,MAAM,UAAU,SAAS,CACvB,QAA2B;IAE3B,wBAAwB,CAAC,MAAM,CAAC,eAAe,GAAG,QAAQ,CAAA;AAC5D,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,wBAAwB,GAAG,UAAU;IACjE,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,wBAAwB,GAAG,UAAU;IACjE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAA;QAElD,IAAG,QAAQ,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAA;QACZ,CAAC;IACH,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"onDestroy.js","sourceRoot":"","sources":["../ts/onDestroy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,4FAA4F;AAC5F,IAAI,wBAAwC,CAAA;AAE5C,MAAM,UAAU,SAAS,CACvB,QAA2B;IAE3B,wBAAwB,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,GAAG,QAAQ,CAAA;AACtE,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,wBAAwB,GAAG,UAAU;IACjE,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,wBAAwB,GAAG,UAAU;IACjE,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAA;QAE5D,IAAG,QAAQ,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAA;QACZ,CAAC;IACH,CAAC;CACF,CAAC,CAAA"}

package/js/onInit.js

@@ -1,10 +1,12 @@
-import { setUse } from "./setUse.function.js";
+import { setUse } from "./setUse.function";
 function setCurrentTagSupport(support) {
-    setUse.memory.initCurrentSupport = support;
+    setUse.memory.initCurrentTemplater = support.templater;
 }
 export function onInit(callback) {
-    if (!setUse.memory.initCurrentSupport.memory.init) {
-        setUse.memory.initCurrentSupport.memory.init = callback;
+    const templater = setUse.memory.initCurrentTemplater;
+    if (!templater.global.init) {
+        ;
+        templater.global.init = callback;
         callback(); // fire init
     }
 }

package/js/onInit.js.map

@@ -1 +1 @@
-{"version":3,"file":"onInit.js","sourceRoot":"","sources":["../ts/onInit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAI7C,SAAS,oBAAoB,CAAC,OAAmB;IAC/C,MAAM,CAAC,MAAM,CAAC,kBAAkB,GAAG,OAAO,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,QAAwB;IAExB,IAAG,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAA;QACvD,QAAQ,EAAE,CAAA,CAAC,YAAY;IACzB,CAAC;AACH,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC5D,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;CAC7D,CAAC,CAAA"}
+{"version":3,"file":"onInit.js","sourceRoot":"","sources":["../ts/onInit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,SAAS,oBAAoB,CAAC,OAAuB;IACnD,MAAM,CAAC,MAAM,CAAC,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,QAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAuC,CAAA;IACvE,IAAG,CAAE,SAAS,CAAC,MAAc,CAAC,IAAI,EAAE,CAAC;QACnC,CAAC;QAAC,SAAS,CAAC,MAAc,CAAC,IAAI,GAAG,QAAQ,CAAA;QAC1C,QAAQ,EAAE,CAAA,CAAC,YAAY;IACzB,CAAC;AACH,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC5D,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;CAC7D,CAAC,CAAA"}

package/js/processAttribute.function.d.ts

@@ -0,0 +1,3 @@
+import { Context, Tag } from './Tag.class';
+import { HowToSet } from './interpolateAttributes';
+export declare function processAttribute(attrName: string, value: string | null, child: Element, scope: Context, ownerTag: Tag, howToSet: HowToSet): void;

package/js/processAttribute.function.js

@@ -0,0 +1,122 @@
+import { inputAttribute } from './inputAttribute';
+import { isSubjectInstance } from './isInstance';
+import { bindSubjectCallback } from './bindSubjectCallback.function';
+const startRegX = /^\s*{__tagvar/;
+const endRegX = /}\s*$/;
+function isTagVar(value) {
+    return value && value.search(startRegX) >= 0 && value.search(endRegX) >= 0;
+}
+export 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);
+    }
+}
+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);
+}
+function getContextValueByVarString(scope, value) {
+    const code = value.replace('{', '').split('').reverse().join('').replace('}', '').split('').reverse().join('');
+    return scope[code];
+}
+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 processNameValueAttr(attrName, result, child, ownerTag, howToSet) {
+    const isSpecial = isSpecialAttr(attrName);
+    // attach as callback?
+    if (result instanceof Function) {
+        const action = function (...args) {
+            const result2 = result(child, args);
+            return result2;
+        };
+        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) => {
+            if (newAttrValue instanceof Function) {
+                newAttrValue = bindSubjectCallback(newAttrValue, ownerTag);
+            }
+            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) {
+        const fun = function (...args) {
+            return newAttrValue(child, args);
+        };
+        // access to original function
+        fun.tagFunction = newAttrValue;
+        child[attrName] = fun;
+        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);
+}
+/** Looking for (class | style) followed by a period */
+function isSpecialAttr(attrName) {
+    return attrName.search(/^(class|style)(\.)/) >= 0;
+}
+//# sourceMappingURL=processAttribute.function.js.map

package/js/processAttribute.function.js.map

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

package/js/processNewValue.function.d.ts

@@ -1,2 +1,2 @@
-import { Context, Tag } from "./Tag.class.js";
-export declare function processNewValue(hasValue: boolean, value: any, context: Context, variableName: string, ownerTag: Tag): void;
+import { Tag } from './Tag.class';
+export declare function processNewValue(hasValue: boolean, value: any, ownerTag: Tag): any;

package/js/processNewValue.function.js

@@ -1,29 +1,27 @@
-import { getSubjectFunction, setValueRedraw } from "./Tag.utils.js";
-import { ValueSubject } from "./ValueSubject.js";
-import { isSubjectInstance, isTagComponent, isTagInstance } from "./isInstance.js";
-export function processNewValue(hasValue, value, context, variableName, ownerTag) {
+import { ValueSubject } from './ValueSubject';
+import { isSubjectInstance, isTagComponent, isTagInstance } from './isInstance';
+export function processNewValue(hasValue, value, ownerTag) {
     if (isTagComponent(value)) {
-        const existing = context[variableName] = new ValueSubject(value);
-        setValueRedraw(value, existing, ownerTag);
-        return;
+        const tagSubject = new ValueSubject(value);
+        return tagSubject;
     }
     if (value instanceof Function) {
-        context[variableName] = getSubjectFunction(value, ownerTag);
-        return;
+        // return getSubjectFunction(value, ownerTag)
+        return new ValueSubject(value);
     }
     if (!hasValue) {
         return; // more strings than values, stop here
     }
     if (isTagInstance(value)) {
         value.ownerTag = ownerTag;
-        ownerTag.children.push(value);
-        context[variableName] = new ValueSubject(value);
-        return;
+        if (ownerTag.childTags.find(x => x === value)) {
+            throw new Error('about to reattach tag already present - 2');
+        }
+        return new ValueSubject(value);
     }
     if (isSubjectInstance(value)) {
-        context[variableName] = value;
-        return;
+        return value; // its already a value subject
     }
-    context[variableName] = new ValueSubject(value);
+    return new ValueSubject(value);
 }
 //# sourceMappingURL=processNewValue.function.js.map

package/js/processNewValue.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processNewValue.function.js","sourceRoot":"","sources":["../ts/processNewValue.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAElF,MAAM,UAAU,eAAe,CAC7B,QAAiB,EACjB,KAAU,EACV,OAAgB,EAChB,YAAoB,EACpB,QAAa;IAEb,IAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,YAAY,CAAC,KAAK,CAAe,CAAA;QAC9E,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAM;IACR,CAAC;IAED,IAAG,KAAK,YAAY,QAAQ,EAAE,CAAC;QAC7B,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAM;IACR,CAAC;IAED,IAAG,CAAC,QAAQ,EAAE,CAAC;QACb,OAAM,CAAC,sCAAsC;IAC/C,CAAC;IAED,IAAG,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAA;QAC/C,OAAM;IACR,CAAC;IAED,IAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,YAAY,CAAC,GAAG,KAAK,CAAA;QAC7B,OAAM;IACR,CAAC;IAED,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAA;AACjD,CAAC"}
+{"version":3,"file":"processNewValue.function.js","sourceRoot":"","sources":["../ts/processNewValue.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE/E,MAAM,UAAU,eAAe,CAC7B,QAAiB,EACjB,KAAU,EACV,QAAa;IAEb,IAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC,KAAK,CAAe,CAAA;QACxD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,IAAG,KAAK,YAAY,QAAQ,EAAE,CAAC;QAC7B,6CAA6C;QAC7C,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAED,IAAG,CAAC,QAAQ,EAAE,CAAC;QACb,OAAM,CAAC,sCAAsC;IAC/C,CAAC;IAED,IAAG,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAEzB,IAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAC9D,CAAC;QAED,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAED,IAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA,CAAC,8BAA8B;IAC7C,CAAC;IAED,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC"}

package/js/processRegularValue.function.d.ts

@@ -1,7 +1,5 @@
-import { Clones } from "./Clones.type";
-import { Tag } from "./Tag.class";
-import { DisplaySubject } from "./Tag.utils";
-import { Template } from "./interpolateTemplate.js";
-export declare function processRegularValue(value: any, result: DisplaySubject, // could be tag via result.tag
-template: Template, // <template end interpolate /> (will be removed)
-ownerTag: Tag): Clones;
+import { DisplaySubject } from './Tag.utils';
+import { Template } from './interpolateTemplate';
+export type RegularValue = string | number | undefined | boolean;
+export declare function processRegularValue(value: RegularValue, subject: DisplaySubject, // could be tag via subject.tag
+template: Element | Text | Template): void;

package/js/processRegularValue.function.js

@@ -1,21 +1,14 @@
-import { updateBetweenTemplates } from "./interpolateTemplate.js";
-export function processRegularValue(value, result, // could be tag via result.tag
-template, // <template end interpolate /> (will be removed)
-ownerTag) {
-    const before = result.clone || template; // Either the template is on the doc OR its the first element we last put on doc
-    result.template = template;
+import { updateBetweenTemplates } from './interpolateTemplate';
+export function processRegularValue(value, subject, // could be tag via subject.tag
+template) {
+    subject.template = template;
+    const before = subject.clone || template; // Either the template is on the doc OR its the first element we last put on doc
+    if (subject.lastValue === value) {
+        return; // no need to update display, its the same
+    }
+    subject.lastValue = value;
     // Processing of regular values
     const clone = updateBetweenTemplates(value, before);
-    result.clone = clone; // remember single element put down, for future updates
-    const clones = [];
-    const oldPos = ownerTag.clones.indexOf(before); // is the insertBefore guide being considered one of the tags clones?
-    const isOnlyGuideInClones = oldPos >= 0 && !ownerTag.clones.includes(clone);
-    const exchangeGuideForClone = isOnlyGuideInClones && !before.parentNode; // guide is in clones AND guide is not on the document
-    if (exchangeGuideForClone) {
-        ownerTag.clones.splice(oldPos, 1); // remove insertBefore guide from tag
-        ownerTag.clones.push(clone); // exchange guide for element actually on document
-        clones.push(clone); // record the one element that in the end is on the document
-    }
-    return clones;
+    subject.clone = clone; // remember single element put down, for future updates
 }
 //# sourceMappingURL=processRegularValue.function.js.map

package/js/processRegularValue.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processRegularValue.function.js","sourceRoot":"","sources":["../ts/processRegularValue.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAE3E,MAAM,UAAU,mBAAmB,CACjC,KAAU,EACV,MAAsB,EAAE,8BAA8B;AACtD,QAAkB,EAAE,iDAAiD;AACrE,QAAa;IAEb,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,QAAQ,CAAA,CAAC,gFAAgF;IACxH,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE1B,+BAA+B;IAC/B,MAAM,KAAK,GAAG,sBAAsB,CAClC,KAAK,EACL,MAAM,CACP,CAAA;IAED,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA,CAAC,uDAAuD;IAE5E,MAAM,MAAM,GAAW,EAAE,CAAA;IACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,CAAC,qEAAqE;IACpH,MAAM,mBAAmB,GAAG,MAAM,IAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACzE,MAAM,qBAAqB,GAAG,mBAAmB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA,CAAC,sDAAsD;IAE9H,IAAI,qBAAqB,EAAG,CAAC;QAC3B,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA,CAAC,qCAAqC;QACvE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA,CAAC,kDAAkD;QAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA,CAAC,4DAA4D;IACjF,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"processRegularValue.function.js","sourceRoot":"","sources":["../ts/processRegularValue.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAIxE,MAAM,UAAU,mBAAmB,CACjC,KAAmB,EACnB,OAAuB,EAAE,+BAA+B;AACxD,QAAmC;IAEnC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAA,CAAC,gFAAgF;IAEzH,IAAG,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;QAC/B,OAAM,CAAC,0CAA0C;IACnD,CAAC;IAED,OAAO,CAAC,SAAS,GAAG,KAAK,CAAA;IAEzB,+BAA+B;IAC/B,MAAM,KAAK,GAAG,sBAAsB,CAClC,KAAK,EACL,MAAM,CACP,CAAA;IAED,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA,CAAC,uDAAuD;AAC/E,CAAC"}

package/js/processSubjectComponent.function.d.ts

@@ -1,8 +1,8 @@
-import { TemplaterResult } from "./templater.utils.js";
-import { Counts } from "./interpolateTemplate.js";
-import { Tag } from "./Tag.class.js";
-import { TagSubject } from "./Tag.utils.js";
-export declare function processSubjectComponent(value: TemplaterResult, result: TagSubject, template: Element, ownerTag: Tag, options: {
+import { TemplaterResult } from './TemplaterResult.class';
+import { Counts, Template } from './interpolateTemplate';
+import { Tag } from './Tag.class';
+import { TagSubject } from './Tag.utils';
+export declare function processSubjectComponent(templater: TemplaterResult, subject: TagSubject, template: Element | Text | Template, ownerTag: Tag, options: {
     counts: Counts;
     forceElement?: boolean;
-}): import("./Clones.type.js").Clones;
+}): void;