taggedjs 2.4.2 → 2.4.12

package/js/processSubjectComponent.function.js

@@ -1,38 +1,46 @@
-import { runBeforeRedraw, runBeforeRender } from "./tagRunner.js";
-import { setUse } from "./setUse.function.js";
-import { processTagResult } from "./processTagResult.function.js";
-export function processSubjectComponent(value, result, template, ownerTag, options) {
+import { renderWithSupport } from './TemplaterResult.class';
+import { setUse } from './setUse.function';
+import { processTagResult } from './processTagResult.function';
+import { TagSupport } from './TagSupport.class';
+export function processSubjectComponent(templater, subject, template, ownerTag, options) {
+    // Check if function component is wrapped in a tag() call
     // TODO: This below check not needed in production mode
-    if (value.tagged !== true) {
-        let name = value.wrapper.original.name || value.wrapper.original.constructor?.name;
+    if (templater.tagged !== true) {
+        const original = templater.wrapper.original;
+        let name = original.name || original.constructor?.name;
         if (name === 'Function') {
             name = undefined;
         }
-        const label = name || value.wrapper.original.toString().substring(0, 120);
+        const label = name || original.toString().substring(0, 120);
         const error = new Error(`Not a tag component. Wrap your function with tag(). Example tag(props => html\`\`) on component:\n\n${label}\n\n`);
         throw error;
     }
-    const templater = value;
-    const tagSupport = value.tagSupport;
-    let retag = templater.newest;
+    templater.tagSupport = new TagSupport(ownerTag.tagSupport, templater, subject);
+    // templater.oldest = subject.tag?.tagSupport.oldest || templater.oldest
+    templater.global.insertBefore = template;
+    let retag = subject.tag;
     const providers = setUse.memory.providerConfig;
     providers.ownerTag = ownerTag;
-    const isFirstTime = !retag || options.forceElement;
-    if (isFirstTime) {
-        if (retag) {
-            runBeforeRedraw(tagSupport, retag);
+    const isRedraw = !retag || options.forceElement;
+    if (isRedraw) {
+        const preClones = ownerTag.clones.map(clone => clone);
+        retag = renderWithSupport(templater.tagSupport, subject.tag, // existing tag
+        subject, ownerTag);
+        if (retag.tagSupport.templater.global.newest != retag) {
+            throw new Error('mismatch result newest');
         }
-        else {
-            runBeforeRender(tagSupport, ownerTag);
+        templater.global.newest = retag;
+        if (ownerTag.clones.length > preClones.length) {
+            const myClones = ownerTag.clones.filter(fClone => !preClones.find(clone => clone === fClone));
+            retag.clones.push(...myClones);
         }
-        retag = templater.forceRenderTemplate(tagSupport, ownerTag);
-        templater.newest = retag;
+        if (ownerTag.childTags.find(x => x === retag)) {
+            throw new Error('about to reattach tag already present');
+        }
+        ownerTag.childTags.push(retag);
     }
-    ownerTag.children.push(retag);
-    tagSupport.templater = retag.tagSupport.templater;
-    const clones = processTagResult(retag, result, // The element set here will be removed from document. Also result.tag will be added in here
+    processTagResult(retag, subject, // The element set here will be removed from document. Also result.tag will be added in here
     template, // <template end interpolate /> (will be removed)
     options);
-    return clones;
 }
 //# sourceMappingURL=processSubjectComponent.function.js.map

package/js/processSubjectComponent.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processSubjectComponent.function.js","sourceRoot":"","sources":["../ts/processSubjectComponent.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAG7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAGjE,MAAM,UAAU,uBAAuB,CACrC,KAAsB,EACtB,MAAkB,EAClB,QAAiB,EACjB,QAAa,EACb,OAAiD;IAEjD,uDAAuD;IACvD,IAAG,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACzB,IAAI,IAAI,GAAuB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAA;QAEtG,IAAG,IAAI,KAAK,UAAU,EAAE,CAAC;YACvB,IAAI,GAAG,SAAS,CAAA;QAClB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAC,GAAG,CAAC,CAAA;QACxE,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,uGAAuG,KAAK,MAAM,CAAC,CAAA;QAC3I,MAAM,KAAK,CAAA;IACb,CAAC;IAED,MAAM,SAAS,GAAG,KAAwB,CAAA;IAC1C,MAAM,UAAU,GAAe,KAAK,CAAC,UAAU,CAAA;IAE/C,IAAI,KAAK,GAAG,SAAS,CAAC,MAAa,CAAA;IAEnC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;IAC9C,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE7B,MAAM,WAAW,GAAG,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,CAAA;IAElD,IAAG,WAAW,EAAE,CAAC;QACf,IAAG,KAAK,EAAE,CAAC;YACT,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACvC,CAAC;QAED,KAAK,GAAG,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3D,SAAS,CAAC,MAAM,GAAG,KAAK,CAAA;IAC1B,CAAC;IAED,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAE7B,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,SAAS,CAAA;IAEjD,MAAM,MAAM,GAAG,gBAAgB,CAC7B,KAAK,EACL,MAAM,EAAE,4FAA4F;IACpG,QAAQ,EAAE,iDAAiD;IAC3D,OAAO,CACR,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"processSubjectComponent.function.js","sourceRoot":"","sources":["../ts/processSubjectComponent.function.ts"],"names":[],"mappings":"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"}

package/js/processSubjectValue.function.d.ts

@@ -1,23 +1,26 @@
-import { TagArraySubject } from "./processTagArray.js";
-import { Clones } from "./Clones.type.js";
-import { Tag } from "./Tag.class.js";
-import { Counts, Template } from "./interpolateTemplate.js";
-import { DisplaySubject, TagSubject } from "./Tag.utils.js";
+import { TagArraySubject } from './processTagArray';
+import { TemplaterResult } from './TemplaterResult.class';
+import { Clones } from './Clones.type';
+import { Tag } from './Tag.class';
+import { Counts, Template } from './interpolateTemplate';
+import { DisplaySubject, TagSubject } from './Tag.utils';
+import { ValueSubject } from './ValueSubject';
+import { Callback } from './bindSubjectCallback.function';
 type processOptions = {
     forceElement?: boolean;
     counts: Counts;
 };
 export type ClonesAndPromise = {
     clones: Clones;
-    promise?: Promise<any>;
 };
-export declare function processSubjectValue(value: any, result: TagArraySubject | TagSubject | DisplaySubject, // could be tag via result.tag
-template: Template, // <template end interpolate /> (will be removed)
+export type InterpolateSubject = TagArraySubject | TagSubject | DisplaySubject | ValueSubject<Callback>;
+export declare function processSubjectValue(value: any | TemplaterResult, subject: InterpolateSubject, // could be tag via result.tag
+template: Element | Text | Template, // <template end interpolate /> (will be removed)
 ownerTag: Tag, // owner
-options: processOptions): ClonesAndPromise;
-export declare function processTag(value: any, result: TagSubject, // could be tag via result.tag
-template: Template, // <template end interpolate /> (will be removed)
-ownerTag: Tag, // owner
-options: processOptions): Clones;
-export declare function destroySimpleValue(template: Element, resultTag: DisplaySubject): void;
+options: processOptions): Clones | undefined;
+/** Could be a regular tag or a component. Both are Tag.class */
+export declare function processTag(tag: Tag, subject: TagSubject, // could be tag via result.tag
+insertBefore: Element | Text | Template, // <template end interpolate /> (will be removed)
+ownerTag: Tag): void;
+export declare function applyFakeTemplater(tag: Tag, ownerTag: Tag, subject: TagSubject): void;
 export {};

package/js/processSubjectValue.function.js

@@ -1,11 +1,9 @@
-import { processSubjectComponent } from "./processSubjectComponent.function.js";
-import { processTagResult } from "./processTagResult.function.js";
-import { isTagArray, isTagComponent, isTagInstance } from "./isInstance.js";
-import { processTagArray } from "./processTagArray.js";
-import { TagSupport } from "./TagSupport.class.js";
-import { updateBetweenTemplates } from "./interpolateTemplate.js";
-import { ValueSubject } from "./ValueSubject.js";
-import { processRegularValue } from "./processRegularValue.function.js";
+import { processSubjectComponent } from './processSubjectComponent.function';
+import { isTagArray, isTagComponent, isTagInstance } from './isInstance';
+import { processTagArray } from './processTagArray';
+import { TagSupport } from './TagSupport.class';
+import { ValueSubject } from './ValueSubject';
+import { processRegularValue } from './processRegularValue.function';
 var ValueTypes;
 (function (ValueTypes) {
     ValueTypes["tag"] = "tag";
@@ -25,90 +23,68 @@ function getValueType(value) {
     }
     return ValueTypes.value;
 }
-export function processSubjectValue(value, result, // could be tag via result.tag
+export function processSubjectValue(value, subject, // could be tag via result.tag
 template, // <template end interpolate /> (will be removed)
 ownerTag, // owner
 options) {
     const valueType = getValueType(value);
-    // Previously was simple value, now its a tag of some sort
-    const resultTag = result;
-    const clone = resultTag.clone;
-    const noLongerSimpleValue = valueType !== ValueTypes.value && clone;
-    if (noLongerSimpleValue) {
-        destroySimpleValue(template, resultTag);
-    }
     switch (valueType) {
         case ValueTypes.tag:
-            return {
-                clones: processTag(value, result, template, ownerTag, options)
-            };
+            processTag(value, subject, template, ownerTag);
+            return;
         case ValueTypes.tagArray:
-            return {
-                clones: processTagArray(result, value, template, ownerTag, options)
-            };
+            return processTagArray(subject, value, template, ownerTag, options);
         case ValueTypes.tagComponent:
-            return {
-                clones: processSubjectComponent(value, result, template, ownerTag, options)
-            };
-    }
-    // *if processing WAS a tag BUT NOW its some other non-tag value
-    if (result.tag) {
-        return {
-            clones: [],
-            promise: processWasTag(value, result, template, options),
-        };
+            processSubjectComponent(value, subject, template, ownerTag, options);
+            return;
     }
-    return {
-        clones: processRegularValue(value, result, template, ownerTag)
-    };
+    processRegularValue(value, subject, template);
 }
-export function processTag(value, result, // could be tag via result.tag
-template, // <template end interpolate /> (will be removed)
-ownerTag, // owner
-options) {
+/** Could be a regular tag or a component. Both are Tag.class */
+export function processTag(tag, subject, // could be tag via result.tag
+insertBefore, // <template end interpolate /> (will be removed)
+ownerTag) {
     // first time seeing this tag?
-    if (!value.tagSupport) {
-        value.tagSupport = new TagSupport({}, // the template is provided via html`` call
-        new ValueSubject([]));
-        // asking me to render will cause my parent to render
-        value.tagSupport.mutatingRender = () => {
-            ownerTag.tagSupport.render();
-        };
-        value.tagSupport.oldest = value.tagSupport.oldest || value;
-        ownerTag.children.push(value);
-        value.ownerTag = ownerTag;
+    if (!tag.tagSupport) {
+        if (!isTagInstance(tag)) {
+            throw new Error('issue non-tag here');
+        }
+        applyFakeTemplater(tag, ownerTag, subject);
+        if (ownerTag.childTags.find(x => x === tag)) {
+            throw new Error('about to reattach tag already present - 5');
+        }
+        ownerTag.childTags.push(tag);
     }
-    result.template = template;
-    const clones = processTagResult(value, result, // Function will attach result.tag
-    template, options);
-    return clones;
+    tag.ownerTag = ownerTag;
+    subject.template = insertBefore;
+    tag.buildBeforeElement(insertBefore, {
+        counts: { added: 0, removed: 0 },
+        forceElement: true, test: false,
+    });
 }
-function processWasTag(value, result, // could be tag via result.tag,
-template, // <template end interpolate /> (will be removed)
-options) {
-    const tag = result.tag;
-    // put the template back
-    const lastFirstChild = result.clone || template; // result.tag.clones[0] // template.lastFirstChild
-    // const parentNode = lastFirstChild.parentNode || template.parentNode
-    // put the template back down
-    lastFirstChild.parentNode.insertBefore(template, lastFirstChild);
-    const clone = updateBetweenTemplates(value, 
-    // template // template, // this will be removed from document inside this function
-    lastFirstChild);
-    result.clone = clone;
-    // cleanup old
-    delete result.tag;
-    /* destroy logic */
-    const stagger = options.counts.removed;
-    const promise = tag.destroy({ stagger }).then(animated => options.counts.removed = stagger + animated);
-    /* end: destroy logic */
-    return promise;
+export function applyFakeTemplater(tag, ownerTag, subject) {
+    if (!ownerTag) {
+        throw new Error('no owner error');
+    }
+    const fakeTemplater = getFakeTemplater();
+    tag.tagSupport = new TagSupport(ownerTag.tagSupport, fakeTemplater, // the template is provided via html`` call
+    subject);
+    fakeTemplater.global.oldest = tag;
+    fakeTemplater.global.newest = tag;
+    fakeTemplater.tagSupport = tag.tagSupport;
+    // asking me to render will cause my parent to render
+    tag.ownerTag = ownerTag;
 }
-export function destroySimpleValue(template, resultTag) {
-    const clone = resultTag.clone;
-    const parent = clone.parentNode;
-    parent.insertBefore(template, clone);
-    parent.removeChild(clone);
-    delete resultTag.clone;
+function getFakeTemplater() {
+    return {
+        global: {
+            renderCount: 0,
+            providers: [],
+            context: {},
+        },
+        children: new ValueSubject([]), // no children
+        props: {},
+        isTag: true,
+    };
 }
 //# sourceMappingURL=processSubjectValue.function.js.map

package/js/processSubjectValue.function.js.map

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

package/js/processTagArray.d.ts

@@ -1,18 +1,19 @@
-import { Clones } from "./Clones.type.js";
-import { Tag } from "./Tag.class.js";
-import { ValueSubject } from "./ValueSubject.js";
-import { Counts } from "./interpolateTemplate.js";
+import { Clones } from './Clones.type';
+import { Tag } from './Tag.class';
+import { ValueSubject } from './ValueSubject';
+import { Counts, Template } from './interpolateTemplate';
 export type LastArrayItem = {
     tag: Tag;
     index: number;
+    deleted?: boolean;
 };
 export type TagArraySubject = ValueSubject<Tag[]> & {
-    lastArray: LastArrayItem[];
-    template: Element;
+    lastArray?: LastArrayItem[];
+    template: Element | Text | Template;
     isChildSubject?: boolean;
 };
-export declare function processTagArray(result: TagArraySubject, value: Tag[], // arry of Tag classes
-template: Element, // <template end interpolate />
+export declare function processTagArray(subject: TagArraySubject, value: Tag[], // arry of Tag classes
+template: Element | Text | Template, // <template end interpolate />
 ownerTag: Tag, options: {
     counts: Counts;
     forceElement?: boolean;

package/js/processTagArray.js

@@ -1,15 +1,16 @@
-import { ValueSubject } from "./ValueSubject.js";
-import { TagSupport } from "./TagSupport.class.js";
-import { ArrayNoKeyError } from "./errors.js";
-export function processTagArray(result, value, // arry of Tag classes
+import { ValueSubject } from './ValueSubject';
+import { ArrayNoKeyError } from './errors';
+import { destroyArrayTag } from './checkDestroyPrevious.function';
+import { applyFakeTemplater } from './processSubjectValue.function';
+export function processTagArray(subject, value, // arry of Tag classes
 template, // <template end interpolate />
 ownerTag, options) {
-    const clones = [];
-    result.lastArray = result.lastArray || []; // {tag, index}[] populated in processTagResult
-    result.template = template;
+    const clones = ownerTag.clones; // []
+    let lastArray = subject.lastArray = subject.lastArray || [];
+    subject.template = template;
     let removed = 0;
     /** 🗑️ remove previous items first */
-    result.lastArray = result.lastArray.filter((item, index) => {
+    lastArray = subject.lastArray = subject.lastArray.filter((item, index) => {
         const newLength = value.length - 1;
         const at = index - removed;
         const lessLength = newLength < at;
@@ -17,12 +18,10 @@ ownerTag, options) {
         const subArrayValue = subTag?.arrayValue;
         const destroyItem = lessLength || !areLikeValues(subArrayValue, item.tag.arrayValue);
         if (destroyItem) {
-            const last = result.lastArray[index];
+            const last = lastArray[index];
             const tag = last.tag;
-            tag.destroy({
-                stagger: options.counts.removed,
-                byParent: false
-            });
+            destroyArrayTag(tag, options.counts);
+            last.deleted = true;
             ++removed;
             ++options.counts.removed;
             return false;
@@ -30,22 +29,16 @@ ownerTag, options) {
         return true;
     });
     // const masterBefore = template || (template as any).clone
-    const before = template || template.clone;
+    const before = template || subject.value.insertBefore || template.clone;
     value.forEach((subTag, index) => {
-        const previous = result.lastArray[index];
-        const previousSupport = subTag.tagSupport || previous?.tag.tagSupport;
-        subTag.tagSupport = previousSupport || new TagSupport({}, new ValueSubject([]));
+        const previous = lastArray[index];
+        const previousSupport = previous?.tag.tagSupport;
+        const fakeSubject = new ValueSubject({});
+        applyFakeTemplater(subTag, ownerTag, fakeSubject);
         if (previousSupport) {
-            previousSupport.newest = subTag;
+            subTag.tagSupport.templater.global = previousSupport.templater.global;
+            previousSupport.templater.global.newest = subTag;
         }
-        else {
-            subTag.tagSupport.mutatingRender = () => {
-                ownerTag.tagSupport.render(); // call owner for needed updates
-                return subTag;
-            };
-            ownerTag.children.push(subTag);
-        }
-        subTag.ownerTag = ownerTag;
         // check for html``.key()
         const keyNotSet = subTag.arrayValue;
         if (keyNotSet?.isArrayValueNeverSet) {
@@ -59,33 +52,39 @@ ownerTag, options) {
             const err = new ArrayNoKeyError(message, details);
             throw err;
         }
-        const couldBeSame = result.lastArray.length > index;
+        const couldBeSame = lastArray.length > index;
         if (couldBeSame) {
             const isSame = areLikeValues(previous.tag.arrayValue, subTag.arrayValue);
             if (isSame) {
                 subTag.tagSupport = subTag.tagSupport || previous.tag.tagSupport;
-                previous.tag.updateByTag(subTag);
+                const oldest = previous.tag.tagSupport.templater.global.oldest;
+                oldest.updateByTag(subTag);
                 return [];
             }
-            return [];
+            processAddTagArrayItem(before, subTag, index, options, lastArray, true);
+            throw new Error('item should be back');
+            // return [] // removed: item should have been previously deleted and will be added back
         }
-        const nextClones = processAddTagArrayItem(before, subTag, result, index, options);
-        clones.push(...nextClones);
+        processAddTagArrayItem(before, subTag, index, options, lastArray, true);
+        ownerTag.childTags.push(subTag);
     });
     return clones;
 }
-function processAddTagArrayItem(before, subTag, result, index, options) {
-    // Added to previous array
-    result.lastArray.push({
+function processAddTagArrayItem(before, subTag, index, options, lastArray, test) {
+    const lastValue = {
         tag: subTag, index
-    });
+    };
+    // Added to previous array
+    lastArray.push(lastValue);
     const counts = {
         added: options.counts.added + index,
         removed: options.counts.removed,
     };
     const lastFirstChild = before; // tag.clones[0] // insertBefore.lastFirstChild    
-    const nextClones = subTag.buildBeforeElement(lastFirstChild, { counts, forceElement: options.forceElement });
-    return nextClones;
+    if (!lastFirstChild.parentNode) {
+        throw new Error('issue adding array item');
+    }
+    subTag.buildBeforeElement(lastFirstChild, { counts, forceElement: options.forceElement, test });
 }
 /** compare two values. If both values are arrays then the items will be compared */
 function areLikeValues(valueA, valueB) {

package/js/processTagArray.js.map

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

package/js/processTagResult.function.d.ts

@@ -1,11 +1,10 @@
-import { Tag } from "./Tag.class.js";
-import { Clones } from "./Clones.type.js";
-import { Counts } from "./interpolateTemplate.js";
-import { TagArraySubject } from "./processTagArray.js";
-import { TagSubject } from "./Tag.utils.js";
-export declare function processTagResult(tag: Tag, result: TagArraySubject | TagSubject | Function, // used for recording past and current value
-insertBefore: Element, // <template end interpolate />
+import { Tag } from './Tag.class';
+import { Counts, Template } from './interpolateTemplate';
+import { TagArraySubject } from './processTagArray';
+import { TagSubject } from './Tag.utils';
+export declare function processTagResult(tag: Tag, subject: TagArraySubject | TagSubject | Function, // used for recording past and current value
+insertBefore: Element | Text | Template, // <template end interpolate />
 { counts, forceElement, }: {
     counts: Counts;
     forceElement?: boolean;
-}): Clones;
+}): void;

package/js/processTagResult.function.js

@@ -1,27 +1,50 @@
-export function processTagResult(tag, result, // used for recording past and current value
+import { destroyTagMemory } from './destroyTag.function';
+export function processTagResult(tag, subject, // used for recording past and current value
 insertBefore, // <template end interpolate />
 { counts, forceElement, }) {
+    if (!insertBefore.parentNode) {
+        throw new Error('before here processTagResult');
+    }
     // *if appears we already have seen
-    const subjectTag = result;
-    const rTag = subjectTag.tag;
-    if (rTag && !forceElement) {
-        // are we just updating an if we already had?
-        if (rTag.isLikeTag(tag)) {
-            // components
-            if (result instanceof Function) {
-                const newTag = result(rTag.tagSupport);
-                rTag.updateByTag(newTag);
-                return [];
+    const subjectTag = subject;
+    const existingTag = subjectTag.tag;
+    const previousTag = existingTag?.tagSupport.templater.global.oldest || undefined; // || tag.tagSupport.oldest // subjectTag.tag
+    const justUpdate = previousTag; // && !forceElement
+    if (previousTag) {
+        if (justUpdate) {
+            const areLike = previousTag.isLikeTag(tag);
+            // are we just updating an if we already had?
+            if (areLike) {
+                // components
+                if (subject instanceof Function) {
+                    const newTag = subject(previousTag.tagSupport);
+                    previousTag.updateByTag(newTag);
+                    if (!newTag.tagSupport.templater.global.oldest) {
+                        throw new Error('maybe 0');
+                    }
+                    subjectTag.tag = newTag;
+                    if (!newTag.hasLiveElements) {
+                        throw new Error('44444 - 2');
+                    }
+                    return;
+                }
+                previousTag.updateByTag(tag);
+                if (!tag.tagSupport.templater.global.oldest) {
+                    throw new Error('maybe 1');
+                }
+                subjectTag.tag = tag;
+                if (!tag.hasLiveElements) {
+                    throw new Error('44444 - 3');
+                }
+                return;
             }
-            rTag.updateByTag(tag);
-            return []; // no clones created in element already on stage
+            destroyTagMemory(previousTag, subject);
+            throw new Error('585 - think we never get here');
         }
     }
-    const clones = tag.buildBeforeElement(insertBefore, {
+    tag.buildBeforeElement(insertBefore, {
         counts,
-        forceElement,
+        forceElement, test: false,
     });
-    subjectTag.tag = tag; // let reprocessing know we saw this previously as an if
-    return clones;
 }
 //# sourceMappingURL=processTagResult.function.js.map

package/js/processTagResult.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"processTagResult.function.js","sourceRoot":"","sources":["../ts/processTagResult.function.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,MAA+C,EAAE,4CAA4C;AAC7F,YAAqB,EAAE,+BAA+B;AACtD,EACE,MAAM,EAAE,YAAY,GAIrB;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,MAAoB,CAAA;IACvC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAA;IAC3B,IAAG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACzB,6CAA6C;QAC7C,IAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,aAAa;YACb,IAAG,MAAM,YAAY,QAAQ,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;gBACxB,OAAO,EAAE,CAAA;YACX,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAErB,OAAO,EAAE,CAAA,CAAC,gDAAgD;QAC5D,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QAClD,MAAM;QACN,YAAY;KACb,CAAC,CAAA;IACF,UAAU,CAAC,GAAG,GAAG,GAAG,CAAA,CAAC,wDAAwD;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"processTagResult.function.js","sourceRoot":"","sources":["../ts/processTagResult.function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,OAAgD,EAAE,4CAA4C;AAC9F,YAAuC,EAAE,+BAA+B;AACxE,EACE,MAAM,EAAE,YAAY,GAIrB;IAED,IAAG,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACjD,CAAC;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,OAAqB,CAAA;IACxC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAA;IAClC,MAAM,WAAW,GAAG,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,MAAa,IAAI,SAAS,CAAA,CAAC,6CAA6C;IACrI,MAAM,UAAU,GAAG,WAAW,CAAA,CAAC,mBAAmB;IAElD,IAAG,WAAW,EAAE,CAAC;QACf,IAAG,UAAU,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YAE1C,6CAA6C;YAC7C,IAAG,OAAO,EAAE,CAAC;gBACX,aAAa;gBACb,IAAG,OAAO,YAAY,QAAQ,EAAE,CAAC;oBAC/B,MAAM,MAAM,GAAQ,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;oBACnD,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;oBAC/B,IAAG,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;wBAC9C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;oBAC5B,CAAC;oBACD,UAAU,CAAC,GAAG,GAAG,MAAM,CAAA;oBAEvB,IAAG,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;wBAC3B,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;oBAC9B,CAAC;oBAED,OAAM;gBACR,CAAC;gBAED,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;gBAC5B,IAAG,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC3C,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;gBAC5B,CAAC;gBAED,UAAU,CAAC,GAAG,GAAG,GAAG,CAAA;gBAEpB,IAAG,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;gBAC9B,CAAC;gBAED,OAAM;YACR,CAAC;YAED,gBAAgB,CAAC,WAAW,EAAE,OAAqB,CAAC,CAAA;YACpD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IAED,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QACnC,MAAM;QACN,YAAY,EAAE,IAAI,EAAE,KAAK;KAC1B,CAAC,CAAA;AACJ,CAAC"}

package/js/provider.utils.d.ts

@@ -1,2 +1,2 @@
-import { Tag } from "./Tag.class.js";
+import { Tag } from './Tag.class';
 export declare function providersChangeCheck(tag: Tag): void;