taggedjs 2.4.17 → 2.4.31

package/js/interpolations/interpolateElement.d.ts

@@ -0,0 +1,14 @@
+import { InterpolatedContentTemplates } from "./interpolateContentTemplates";
+import { Context, TagTemplate } from "../Tag.class";
+import { Counts } from "./interpolateTemplate";
+import { TagSupport } from "../TagSupport.class";
+export type InterpolateOptions = {
+    /** make the element go on document */
+    forceElement?: boolean;
+    counts: Counts;
+};
+/** Review elements within an element */
+export declare function interpolateElement(container: Element, // 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").InterpolatedTemplates;

package/js/interpolations/interpolateElement.js

@@ -0,0 +1,36 @@
+import { interpolateAttributes } from "./interpolateAttributes";
+import { interpolateToTemplates } from "./interpolations";
+import { interpolateContentTemplates } from "./interpolateContentTemplates";
+import { escapeSearch, variablePrefix } from "../Tag.class";
+/** Review elements within an element */
+export function interpolateElement(container, // 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 children = template.content.children;
+    if (result.keys.length) {
+        const { clones: nextClones, tagComponents: nextTagComponents } = interpolateContentTemplates(container, context, ownerSupport, options, children);
+        clones.push(...nextClones);
+        tagComponents.push(...nextTagComponents);
+    }
+    interpolateAttributes(container, context, ownerSupport);
+    processChildrenAttributes(children, context, ownerSupport);
+    return { clones, tagComponents };
+}
+function processChildrenAttributes(children, context, ownerSupport) {
+    new Array(...children).forEach(child => {
+        interpolateAttributes(child, context, ownerSupport);
+        if (child.children) {
+            processChildrenAttributes(child.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

@@ -0,0 +1 @@
+{"version":3,"file":"interpolateElement.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAgC,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AACzG,OAAO,EAAwB,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAWjF,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAChC,SAAkB,EAAE,wDAAwD;AAC5E,OAAgB,EAAE,6BAA6B;AAC/C,qBAAkC,EAClC,YAAwB,EACxB,OAA2B;IAE3B,MAAM,MAAM,GAAW,EAAE,CAAA;IACzB,MAAM,aAAa,GAAiC,EAAE,CAAA;IACtD,MAAM,MAAM,GAAG,qBAAqB,CAAC,aAAa,CAAA;IAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAA;IAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAA;IAE1C,IAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAC,GAAG,2BAA2B,CACxF,SAAS,EACT,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,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IACvD,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,IAAI,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACrC,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,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,MAAM,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;IACnE,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/interpolations/interpolateTemplate.d.ts

@@ -0,0 +1,32 @@
+import { Context, ElementBuildOptions } from "../Tag.class";
+import { InterpolateOptions } from "./interpolateElement";
+import { Clones, InsertBefore } from "../Clones.type";
+import { InterpolateSubject } from "../processSubjectValue.function";
+import { TagSupport } from "../TagSupport.class";
+export type Template = Element & {
+    clone?: any;
+};
+export type InterpolateComponentResult = {
+    subject: InterpolateSubject;
+    insertBefore: Element | Text | Template;
+    ownerSupport: TagSupport;
+    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'}
+ownerSupport: TagSupport, // Tag class
+counts: Counts, // used for animation stagger computing
+options: InterpolateOptions): InterpolateTemplateResult;
+export declare function subscribeToTemplate(insertBefore: InsertBefore, subject: InterpolateSubject, ownerSupport: TagSupport, counts: Counts, // used for animation stagger computing
+{ isForceElement }: {
+    isForceElement?: boolean;
+}): void;
+export type Counts = {
+    added: number;
+    removed: number;
+};
+export declare function afterElmBuild(elm: Element | ChildNode, options: ElementBuildOptions, context: Context, ownerSupport: TagSupport): void;

package/js/interpolations/interpolateTemplate.js

@@ -0,0 +1,80 @@
+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'}
+ownerSupport, // Tag class
+counts, // used for animation stagger computing
+options) {
+    // TODO: THe clones array is useless here
+    const clones = [];
+    if (!insertBefore.hasAttribute('end')) {
+        return { clones }; // only care about <template end>
+    }
+    const variableName = insertBefore.getAttribute('id');
+    if (variableName?.substring(0, variablePrefix.length) !== variablePrefix) {
+        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,
+                ownerSupport,
+                subject: existingSubject,
+                insertBefore
+            }
+        };
+    }
+    let isForceElement = options.forceElement;
+    subscribeToTemplate(insertBefore, existingSubject, ownerSupport, counts, { isForceElement });
+    return { clones };
+}
+export function subscribeToTemplate(insertBefore, subject, ownerSupport, counts, // used for animation stagger computing
+{ isForceElement }) {
+    let called = false;
+    const callback = (value) => {
+        if (called) {
+            updateExistingValue(subject, value, ownerSupport, insertBefore);
+            return;
+        }
+        const templater = value;
+        processSubjectValue(templater, subject, insertBefore, ownerSupport, {
+            counts: { ...counts },
+            forceElement: isForceElement,
+        });
+        if (isForceElement) {
+            isForceElement = false; // only can happen once
+        }
+        called = true;
+    };
+    const sub = subject.subscribe(callback);
+    ownerSupport.global.subscriptions.push(sub);
+}
+export function afterElmBuild(elm, options, context, ownerSupport) {
+    if (!elm.getAttribute) {
+        return;
+    }
+    const tagName = elm.nodeName; // elm.tagName
+    if (tagName === 'TEXTAREA') {
+        scanTextAreaValue(elm, context, ownerSupport);
+    }
+    let diff = options.counts.added;
+    diff = elementInitCheck(elm, options.counts) - diff;
+    if (elm.children) {
+        new Array(...elm.children).forEach((child, index) => {
+            const subOptions = {
+                ...options,
+                counts: options.counts,
+            };
+            return afterElmBuild(child, subOptions, context, ownerSupport);
+        });
+    }
+}
+//# sourceMappingURL=interpolateTemplate.js.map

package/js/interpolations/interpolateTemplate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interpolateTemplate.js","sourceRoot":"","sources":["../../ts/interpolations/interpolateTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,cAAc,EAAE,MAAM,cAAc,CAAA;AAEhF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAqC,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AACxG,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAgBrE,MAAM,UAAU,mBAAmB,CACjC,YAAsB,EAAE,iDAAiD;AACzE,OAAgB,EAAE,6CAA6C;AAC/D,YAAwB,EAAE,YAAY;AACtC,MAAc,EAAE,uCAAuC;AACvD,OAA2B;IAE3B,yCAAyC;IACzC,MAAM,MAAM,GAAW,EAAE,CAAA;IAEzB,IAAK,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAG,CAAC;QACxC,OAAO,EAAC,MAAM,EAAC,CAAA,CAAC,iCAAiC;IACnD,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,OAAO,EAAC,MAAM,EAAC,CAAA,CAAC,uBAAuB;IACzC,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAG,cAAc,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAE5F,yBAAyB;IACzB,IAAG,SAAS,EAAE,CAAC;QACb,OAAO;YACL,MAAM;YACN,YAAY,EAAE;gBACZ,YAAY;gBACZ,YAAY;gBACZ,OAAO,EAAE,eAAe;gBACxB,YAAY;aACb;SAAC,CAAA;IACN,CAAC;IAED,IAAI,cAAc,GAAG,OAAO,CAAC,YAAY,CAAA;IACzC,mBAAmB,CACjB,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,MAAM,EACN,EAAC,cAAc,EAAC,CACjB,CAAA;IAED,OAAO,EAAC,MAAM,EAAC,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,YAA0B,EAC1B,OAA2B,EAC3B,YAAwB,EACxB,MAAc,EAAE,uCAAuC;AACvD,EAAC,cAAc,EAA4B;IAE3C,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,MAAM,QAAQ,GAAG,CAAC,KAAoB,EAAE,EAAE;QACxC,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,mBAAmB,CACjB,SAAS,EACT,OAAO,EACP,YAAY,EACZ,YAAY,EACZ;YACE,MAAM,EAAE,EAAC,GAAG,MAAM,EAAC;YACnB,YAAY,EAAE,cAAc;SAC7B,CACF,CAAA;QAED,IAAG,cAAc,EAAE,CAAC;YAClB,cAAc,GAAG,KAAK,CAAA,CAAC,uBAAuB;QAChD,CAAC;QAED,MAAM,GAAG,IAAI,CAAA;IACf,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,QAAe,CAAC,CAAA;IAC9C,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7C,CAAC;AAOD,MAAM,UAAU,aAAa,CAC3B,GAAwB,EACxB,OAA4B,EAC5B,OAAgB,EAChB,YAAwB;IAExB,IAAG,CAAE,GAAe,CAAC,YAAY,EAAE,CAAC;QAClC,OAAM;IACR,CAAC;IAED,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,IAAI,GAAe,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,KAAK,CAAC,GAAI,GAAe,CAAC,QAAe,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtE,MAAM,UAAU,GAAG;gBACjB,GAAG,OAAO;gBACX,MAAM,EAAE,OAAO,CAAC,MAAM;aACtB,CAAA;YAED,OAAO,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}

package/js/interpolations/interpolations.d.ts

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,18 @@
+// 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 };
+}
+//# sourceMappingURL=interpolations.js.map

package/js/interpolations/interpolations.js.map

@@ -0,0 +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"}

package/js/interpolations/processAttribute.function.d.ts

@@ -0,0 +1,5 @@
+import { Context } from '../Tag.class';
+import { HowToSet } from './interpolateAttributes';
+import { TagSupport } from '../TagSupport.class';
+export declare function processAttribute(attrName: string, value: string | null, child: Element, scope: Context, ownerSupport: TagSupport, howToSet: HowToSet): void;
+export type NoDisplayValue = false | null | undefined;

package/js/interpolations/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, ownerSupport, howToSet) {
+    if (isTagVar(value)) {
+        return processScopedNameValueAttr(attrName, value, child, scope, ownerSupport, 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, ownerSupport, howToSet);
+            lastValue = value;
+        });
+        ownerSupport.global.subscriptions.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, ownerSupport, howToSet) {
+    // get the code inside the brackets like "variable0" or "{variable0}"
+    const result = getContextValueByVarString(scope, value);
+    return processNameValueAttr(attrName, result, child, ownerSupport, howToSet);
+}
+function getContextValueByVarString(scope, value) {
+    const code = value.replace('{', '').split('').reverse().join('').replace('}', '').split('').reverse().join('');
+    return scope[code];
+}
+function processNameOnlyAttr(attrValue, lastValue, child, ownerSupport, 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, ownerSupport, howToSet);
+        return;
+    }
+    if (attrValue instanceof Object) {
+        Object.entries(attrValue).forEach(([name, value]) => processNameValueAttr(name, value, child, ownerSupport, howToSet));
+        return;
+    }
+}
+function processNameValueAttr(attrName, result, child, ownerSupport, 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, ownerSupport);
+            }
+            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
+        ownerSupport.global.subscriptions.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 = [undefined, false, null].includes(newAttrValue);
+    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/interpolations/processAttribute.function.js.map

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

package/js/interpolations/scanTextAreaValue.function.d.ts

@@ -0,0 +1,3 @@
+import { Context } from '../Tag.class';
+import { TagSupport } from '../TagSupport.class';
+export declare function scanTextAreaValue(textarea: HTMLTextAreaElement, context: Context, ownerSupport: TagSupport): void;

package/js/interpolations/scanTextAreaValue.function.js

@@ -0,0 +1,16 @@
+import { processAttribute } from './processAttribute.function';
+const search = new RegExp('\\s*<template interpolate end id="__tagvar(\\d{1,4})"([^>]*)></template>(\\s*)');
+export function scanTextAreaValue(textarea, context, ownerSupport) {
+    const value = textarea.value;
+    if (value.search(search) >= 0) {
+        const match = value.match(/__tagvar(\d{1,4})/);
+        const token = match ? match[0] : '';
+        const dynamic = '{' + token + '}';
+        textarea.value = '';
+        textarea.setAttribute('text-var-value', dynamic);
+        const howToSet = (_elm, _name, value) => textarea.value = value;
+        processAttribute('text-var-value', dynamic, // realValue, // context[token].value,
+        textarea, context, ownerSupport, howToSet);
+    }
+}
+//# sourceMappingURL=scanTextAreaValue.function.js.map

package/js/interpolations/scanTextAreaValue.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanTextAreaValue.function.js","sourceRoot":"","sources":["../../ts/interpolations/scanTextAreaValue.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE9D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,gFAAgF,CAAC,CAAA;AAE3G,MAAM,UAAU,iBAAiB,CAC/B,QAA6B,EAC7B,OAAgB,EAChB,YAAwB;IAExB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;IAC5B,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAG,CAAC,EAAG,CAAC;QAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACnC,MAAM,OAAO,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,CAAA;QACjC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAA;QACnB,QAAQ,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QAEhD,MAAM,QAAQ,GAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;QAEjF,gBAAgB,CACd,gBAAgB,EAChB,OAAO,EAAE,sCAAsC;QAC/C,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,CACT,CAAA;IACH,CAAC;AACH,CAAC"}

package/js/interpolations.js

@@ -10,9 +10,8 @@ export function interpolateToTemplates(template) {
         }
         const noBraces = expression.substring(1, expression.length - 1);
         const id = noBraces;
-        const name = 'template-' + template.length;
         keys.push(id);
-        return `<template interpolate end id="${id}" name="${name}"></template>`;
+        return `<template interpolate end id="${id}"></template>`;
     });
     return { string, keys };
 }

package/js/interpolations.js.map

@@ -1 +1 @@
-{"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,MAAM,IAAI,GAAG,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC1C,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACb,OAAO,iCAAiC,EAAE,WAAW,IAAI,eAAe,CAAA;IAC1E,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

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

package/js/isInstance.js

@@ -1,13 +1,21 @@
 export function isTagComponent(value) {
-    return value?.isTemplater === true;
+    return value?.wrapper?.original instanceof Function;
 }
-export function isTagInstance(tag) {
-    return tag?.isTag === true;
+export function isTag(value) {
+    return isTagTemplater(value) || isTagClass(value);
+}
+export function isTagTemplater(value) {
+    const templater = value;
+    return templater?.isTemplater === true && templater.wrapper === undefined;
+}
+export function isTagClass(value) {
+    const templater = value;
+    return templater?.isTagClass === true;
 }
 export function isSubjectInstance(subject) {
     return (subject?.isSubject === true || subject?.subscribe) ? true : false; // subject?.isSubject === true || 
 }
 export function isTagArray(value) {
-    return value instanceof Array && value.every(x => isTagInstance(x));
+    return value instanceof Array && value.every(x => isTagClass(x) || isTagTemplater(x));
 }
 //# sourceMappingURL=isInstance.js.map

package/js/isInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"isInstance.js","sourceRoot":"","sources":["../ts/isInstance.ts"],"names":[],"mappings":"AAGA,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,OAAgC;IAEhC,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,CAC5B,KAAiC;IAEjC,OAAQ,KAAyB,EAAE,OAAO,EAAE,QAAQ,YAAY,QAAQ,CAAA;AAC1E,CAAC;AAED,MAAM,UAAU,KAAK,CACnB,KAAuC;IAEvC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,KAAiC;IAEjC,MAAM,SAAS,GAAG,KAAwB,CAAA;IAC1C,OAAO,SAAS,EAAE,WAAW,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS,CAAA;AAC3E,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,KAAqB;IAErB,MAAM,SAAS,GAAG,KAAY,CAAA;IAC9B,OAAO,SAAS,EAAE,UAAU,KAAK,IAAI,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAgC;IAEhC,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,UAAU,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;AACvF,CAAC"}

package/js/isLikeTags.function.d.ts

@@ -1,2 +1,4 @@
 import { Tag } from "./Tag.class";
-export declare function isLikeTags(tag0: Tag, tag1: Tag): Boolean;
+import { TagSupport } from "./TagSupport.class";
+export declare function isLikeTags(tagSupport0: TagSupport | Tag, // new
+tagSupport1: TagSupport): Boolean;

package/js/isLikeTags.function.js

@@ -1,17 +1,26 @@
-export function isLikeTags(tag0, tag1) {
-    if (tag0.strings.length !== tag1.strings.length) {
+export function isLikeTags(tagSupport0, // new
+tagSupport1) {
+    const templater0 = tagSupport0.templater;
+    const templater1 = tagSupport1.templater;
+    const tag0 = templater0?.tag || tagSupport0;
+    const tag1 = templater1.tag;
+    const strings0 = tag0.strings;
+    const strings1 = tagSupport1.strings || tag1.strings;
+    if (strings0.length !== strings1.length) {
         return false;
     }
-    const everyStringMatched = tag0.strings.every((string, index) => tag1.strings[index] === string);
+    const everyStringMatched = strings0.every((string, index) => strings1[index] === string);
     if (!everyStringMatched) {
         return false;
     }
-    const valuesLengthsMatch = tag0.values.length === tag1.values.length;
+    const values0 = tagSupport0.values || tag0.values;
+    const values1 = tagSupport1.values || tag1.values;
+    const valuesLengthsMatch = values0.length === values1.length;
     if (!valuesLengthsMatch) {
         return false;
     }
-    const allVarsMatch = tag1.values.every((value, index) => {
-        const compareTo = tag0.values[index];
+    const allVarsMatch = values1.every((value, index) => {
+        const compareTo = values0[index];
         const isFunctions = value instanceof Function && compareTo instanceof Function;
         if (isFunctions) {
             const stringMatch = value.toString() === compareTo.toString();

package/js/isLikeTags.function.js.map

@@ -1 +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"}
+{"version":3,"file":"isLikeTags.function.js","sourceRoot":"","sources":["../ts/isLikeTags.function.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,UAAU,CACxB,WAA6B,EAAE,MAAM;AACrC,WAAuB;IAEvB,MAAM,UAAU,GAAG,WAAW,CAAC,SAAwC,CAAA;IACvE,MAAM,UAAU,GAAG,WAAW,CAAC,SAA4B,CAAA;IAE3D,MAAM,IAAI,GAAG,UAAU,EAAE,GAAG,IAAK,WAAmB,CAAA;IACpD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAU,CAAA;IAElC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAA;IACpD,IAAG,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;QACvC,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,CAAA;IACvF,IAAG,CAAC,kBAAkB,EAAE,CAAC;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAA;IACjD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAA;IACjD,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAA;IAC5D,IAAG,CAAC,kBAAkB,EAAE,CAAC;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAC,EAAE;QACjD,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QAChC,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/processNewValue.function.d.ts

@@ -1,2 +1,3 @@
-import { Tag } from './Tag.class';
-export declare function processNewValue(hasValue: boolean, value: any, ownerTag: Tag): any;
+import { TagSupport } from './TagSupport.class';
+import { InterpolateSubject, TemplateValue } from './processSubjectValue.function';
+export declare function processNewValue(hasValue: boolean, value: TemplateValue, ownerSupport: TagSupport): InterpolateSubject;

package/js/processNewValue.function.js

@@ -1,27 +1,43 @@
 import { ValueSubject } from './subject/ValueSubject';
-import { isSubjectInstance, isTagComponent, isTagInstance } from './isInstance';
-export function processNewValue(hasValue, value, ownerTag) {
+import { isSubjectInstance, isTagClass, isTagComponent, isTagTemplater } from './isInstance';
+import { TemplaterResult } from './TemplaterResult.class';
+import { TagSupport } from './TagSupport.class';
+export function processNewValue(hasValue, value, ownerSupport) {
     if (isTagComponent(value)) {
         const tagSubject = new ValueSubject(value);
         return tagSubject;
     }
     if (value instanceof Function) {
-        // return getSubjectFunction(value, ownerTag)
         return new ValueSubject(value);
     }
     if (!hasValue) {
-        return; // more strings than values, stop here
+        return new ValueSubject(undefined);
     }
-    if (isTagInstance(value)) {
-        value.ownerTag = ownerTag;
-        if (ownerTag.childTags.find(x => x === value)) {
-            throw new Error('about to reattach tag already present - 2');
-        }
-        return new ValueSubject(value);
+    if (isTagTemplater(value)) {
+        const templater = value;
+        const tag = templater.tag;
+        return processNewTag(tag, ownerSupport);
+    }
+    if (isTagClass(value)) {
+        return processNewTag(value, ownerSupport);
     }
+    // is already a value subject?
     if (isSubjectInstance(value)) {
-        return value; // its already a value subject
+        return value;
     }
     return new ValueSubject(value);
 }
+function processNewTag(value, ownerSupport) {
+    const tag = value;
+    let templater = tag.templater;
+    if (!templater) {
+        const children = new ValueSubject([]);
+        templater = new TemplaterResult(undefined, children);
+        templater.tag = tag;
+        tag.templater = templater;
+    }
+    const subject = new ValueSubject(templater);
+    const tagSupport = subject.tagSupport = new TagSupport(templater, ownerSupport, subject);
+    return subject;
+}
 //# 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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,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"}
+{"version":3,"file":"processNewValue.function.js","sourceRoot":"","sources":["../ts/processNewValue.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAI/C,MAAM,UAAU,eAAe,CAC7B,QAAiB,EACjB,KAAoB,EACpB,YAAwB;IAExB,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,OAAO,IAAI,YAAY,CAAW,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,IAAG,CAAC,QAAQ,EAAE,CAAC;QACb,OAAO,IAAI,YAAY,CAAY,SAAS,CAAC,CAAA;IAC/C,CAAC;IAED,IAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,KAAwB,CAAA;QAC1C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAU,CAAA;QAChC,OAAO,aAAa,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IACzC,CAAC;IAED,IAAG,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,aAAa,CAAC,KAAY,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,8BAA8B;IAC9B,IAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,KAA0B,CAAA;IACnC,CAAC;IAED,OAAO,IAAI,YAAY,CAAC,KAAK,CAA8B,CAAA;AAC7D,CAAC;AAED,SAAS,aAAa,CACpB,KAAU,EACV,YAAwB;IAExB,MAAM,GAAG,GAAG,KAAY,CAAA;IAExB,IAAI,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;IAC7B,IAAG,CAAC,SAAS,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,EAAW,CAAC,CAAA;QAC9C,SAAS,GAAG,IAAI,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACpD,SAAS,CAAC,GAAG,GAAG,GAAG,CAAA;QACnB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAA;IAC3B,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,SAAS,CAAe,CAAA;IAEzD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,UAAU,CACpD,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/js/processRegularValue.function.d.ts

@@ -1,5 +1,5 @@
 import { InsertBefore } from './Clones.type';
-import { DisplaySubject } from './Tag.utils';
+import { DisplaySubject } from './subject.types';
 export type RegularValue = string | number | undefined | boolean;
 export declare function processRegularValue(value: RegularValue, subject: DisplaySubject, // could be tag via subject.tag
 insertBefore: InsertBefore): void;

package/js/processSubjectComponent.function.d.ts

@@ -1,9 +1,9 @@
 import { TemplaterResult } from './TemplaterResult.class';
-import { Counts } from './interpolateTemplate';
-import { Tag } from './Tag.class';
-import { TagSubject } from './Tag.utils';
+import { Counts } from './interpolations/interpolateTemplate';
+import { TagSubject } from './subject.types';
+import { TagSupport } from './TagSupport.class';
 import { InsertBefore } from './Clones.type';
-export declare function processSubjectComponent(templater: TemplaterResult, subject: TagSubject, insertBefore: InsertBefore, ownerTag: Tag, options: {
+export declare function processSubjectComponent(templater: TemplaterResult, subject: TagSubject, insertBefore: InsertBefore, ownerSupport: TagSupport, options: {
     counts: Counts;
     forceElement?: boolean;
-}): Tag;
+}): TagSupport;