taggedjs 2.5.24 → 2.6.1

package/js/tag/render/renderExistingTag.function.d.ts

@@ -1,7 +1,5 @@
-import { BaseSupport, Support } from '../Support.class.js';
-import { TagSubject } from '../../subject.types.js';
-/** Returns true when rendering owner is not needed. Returns false when rendering owner should occur */
-export declare function renderExistingTag(oldestSupport: Support | BaseSupport, // oldest with elements on html
-newSupport: Support | BaseSupport, // new to be rendered
+import { AnySupport, BaseSupport, Support } from '../Support.class.js';
+import { ContextItem } from '../Context.types.js';
+export declare function renderExistingReadyTag(lastSupport: AnySupport, newSupport: AnySupport, // new to be rendered
 ownerSupport: BaseSupport | Support, // ownerSupport
-subject: TagSubject): Support;
+subject: ContextItem): AnySupport;

package/js/tag/render/renderExistingTag.function.js

@@ -1,34 +1,18 @@
-import { isLikeTags } from '../isLikeTags.function.js';
 import { renderWithSupport } from './renderWithSupport.function.js';
-import { providersChangeCheck } from '../../state/providersChangeCheck.function.js';
-/** Returns true when rendering owner is not needed. Returns false when rendering owner should occur */
-export function renderExistingTag(oldestSupport, // oldest with elements on html
-newSupport, // new to be rendered
+import { processTag } from '../update/processTag.function.js';
+import { updateSupportBy } from '../updateSupportBy.function.js';
+export function renderExistingReadyTag(lastSupport, newSupport, // new to be rendered
 ownerSupport, // ownerSupport
 subject) {
-    const lastSupport = subject.support; // todo maybe not needed?
     const global = subject.global;
-    // share point between renders
-    newSupport.subject.global = global;
-    const preRenderCount = global.renderCount;
-    providersChangeCheck(oldestSupport);
-    // When the providers were checked, a render to myself occurred and I do not need to re-render again
-    const prevSupport = global.newest;
-    const justUpdate = preRenderCount !== global.renderCount;
-    if (justUpdate) {
-        oldestSupport.subject.global.oldest.updateBy(prevSupport);
-        return prevSupport; // already rendered during triggered events
+    const { support, wasLikeTags } = renderWithSupport(newSupport, lastSupport, subject, ownerSupport);
+    if (wasLikeTags) {
+        updateSupportBy(global.oldest, support);
+        // updateSupportValuesBy(oldest, support)
+        // paint()
+        return support;
     }
-    const toRedrawTag = prevSupport || lastSupport || global.oldest;
-    const reSupport = renderWithSupport(newSupport, toRedrawTag, subject, ownerSupport);
-    const oldest = global.oldest || oldestSupport;
-    const isLikeTag = isLikeTags(prevSupport, reSupport);
-    if (isLikeTag) {
-        subject.support = reSupport;
-        oldest.updateBy(reSupport);
-    }
-    // ??? new - added but then removed
-    // global.newest = reSupport
-    return reSupport;
+    processTag(ownerSupport, subject);
+    return support;
 }
 //# sourceMappingURL=renderExistingTag.function.js.map

package/js/tag/render/renderExistingTag.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderExistingTag.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderExistingTag.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAK,2BAA2B,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAA;AAEnF,uGAAuG;AACvG,MAAM,UAAU,iBAAiB,CAC/B,aAAoC,EAAE,+BAA+B;AACrE,UAAiC,EAAE,qBAAqB;AACxD,YAAmC,EAAE,eAAe;AACpD,OAAmB;IAEnB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAkB,CAAA,CAAC,yBAAyB;IACxE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAE7B,8BAA8B;IAC9B,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;IAElC,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAA;IACzC,oBAAoB,CAAC,aAAa,CAAC,CAAA;IAEnC,oGAAoG;IACpG,MAAM,WAAW,GAAG,MAAM,CAAC,MAAiB,CAAA;IAC5C,MAAM,UAAU,GAAG,cAAc,KAAK,MAAM,CAAC,WAAW,CAAA;IACxD,IAAG,UAAU,EAAE,CAAC;QACd,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACzD,OAAO,WAAW,CAAA,CAAC,2CAA2C;IAChE,CAAC;IAED,MAAM,WAAW,GAAG,WAAW,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,CAAA;IAC/D,MAAM,SAAS,GAAG,iBAAiB,CACjC,UAAU,EACV,WAAW,EACX,OAAO,EACP,YAAuB,CACxB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,aAAa,CAAA;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IACpD,IAAG,SAAS,EAAE,CAAC;QACb,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;QAC3B,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC5B,CAAC;IAED,mCAAmC;IACnC,4BAA4B;IAE5B,OAAO,SAAS,CAAA;AAClB,CAAC"}
+{"version":3,"file":"renderExistingTag.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderExistingTag.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAGhE,MAAM,UAAU,sBAAsB,CACpC,WAAuB,EACvB,UAAsB,EAAE,qBAAqB;AAC7C,YAAmC,EAAE,eAAe;AACpD,OAAoB;IAEpB,MAAM,MAAM,GAAG,OAAO,CAAC,MAA0B,CAAA;IAEjD,MAAM,EAAC,OAAO,EAAE,WAAW,EAAC,GAAG,iBAAiB,CAC9C,UAAU,EACV,WAAW,EACX,OAAO,EACP,YAAuB,CACxB,CAAA;IAED,IAAI,WAAW,EAAG,CAAC;QACjB,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACvC,yCAAyC;QACzC,UAAU;QACV,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,UAAU,CACR,YAAY,EACZ,OAAO,CACR,CAAA;IAED,OAAO,OAAO,CAAA;AAEhB,CAAC"}

package/js/tag/render/renderSubjectComponent.function.js

@@ -1,14 +1,23 @@
 import { renderWithSupport } from './renderWithSupport.function.js';
 export function renderSubjectComponent(subject, reSupport, ownerSupport) {
     const ownGlobal = ownerSupport.subject.global;
-    const preClones = ownGlobal.clones.map(clone => clone);
     reSupport = renderWithSupport(reSupport, subject.support, // existing tag
     subject, ownerSupport);
-    const reGlobal = reSupport.subject.global;
-    if (ownGlobal.clones.length > preClones.length) {
-        const myClones = ownGlobal.clones.filter(fClone => !preClones.find(clone => clone === fClone));
-        reGlobal.clones.push(...myClones);
+    /*
+    const htmlDomMeta = ownGlobal.htmlDomMeta as DomObjectChildren
+    if(!htmlDomMeta) {
+      console.log('xxxxx', ownGlobal)
     }
+    if(htmlDomMeta) {
+      const reGlobal = reSupport.subject.global
+      const preClones = htmlDomMeta.map(clone => clone)
+      if(htmlDomMeta.length > preClones.length) {
+        const myClones = htmlDomMeta.filter(fClone => !preClones.find(clone => clone === fClone))
+        const reHtmlDomMeta = reGlobal.htmlDomMeta as DomObjectChildren
+        reHtmlDomMeta.push(...myClones)
+      }
+    }
+    */
     return reSupport;
 }
 //# sourceMappingURL=renderSubjectComponent.function.js.map

package/js/tag/render/renderSubjectComponent.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderSubjectComponent.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderSubjectComponent.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAIlE,MAAM,UAAU,sBAAsB,CACpC,OAAmB,EACnB,SAAgC,EAChC,YAAmC;IAEnC,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAA;IAC7C,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAEtD,SAAS,GAAG,iBAAiB,CAC3B,SAAS,EACT,OAAO,CAAC,OAAO,EAAE,eAAe;IAChC,OAAO,EACP,YAAY,CACb,CAAA;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAA;IACzC,IAAG,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAA;QAC9F,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,SAAoB,CAAA;AAC7B,CAAC"}
+{"version":3,"file":"renderSubjectComponent.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderSubjectComponent.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAKlE,MAAM,UAAU,sBAAsB,CACpC,OAAmB,EACnB,SAAgC,EAChC,YAAmC;IAEnC,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAA;IAE7C,SAAS,GAAG,iBAAiB,CAC3B,SAAS,EACT,OAAO,CAAC,OAAO,EAAE,eAAe;IAChC,OAAO,EACP,YAAY,CACb,CAAA;IAED;;;;;;;;;;;;;;MAcE;IAEF,OAAO,SAAoB,CAAA;AAC7B,CAAC"}

package/js/tag/render/renderSupport.function.d.ts

@@ -1,4 +1,9 @@
-import { BaseSupport, Support } from '../Support.class.js';
+import { AnySupport } from '../Support.class.js';
+import { Props } from '../../Props.js';
+import { TemplaterResult } from '../TemplaterResult.class.js';
+export declare function isInlineHtml(templater: TemplaterResult): boolean;
 /** Main function used by all other callers to render/update display of a tag component */
-export declare function renderSupport<T extends Support | BaseSupport>(support: T, // must be latest/newest state render
-renderUp: boolean): T;
+export declare function renderSupport<T extends AnySupport>(support: T): T;
+export declare function renderInlineHtml(ownerSupport: AnySupport, support: AnySupport): AnySupport;
+export declare function checkRenderUp(ownerSupport: AnySupport, templater: TemplaterResult, support: AnySupport): boolean;
+export declare function hasPropLengthsChanged(nowProps: Props, latestProps: Props): boolean;

package/js/tag/render/renderSupport.function.js

@@ -1,43 +1,79 @@
 import { deepEqual } from '../../deepFunctions.js';
-import { renderExistingTag } from './renderExistingTag.function.js';
+import { renderExistingReadyTag } from './renderExistingTag.function.js';
+import { ValueTypes } from '../ValueTypes.enum.js';
+import { PropWatches } from '../index.js';
+import { deepCompareDepth, immutablePropMatch, shallowPropMatch } from '../hasSupportChanged.function.js';
+export function isInlineHtml(templater) {
+    return ValueTypes.templater === templater.tagJsType;
+}
 /** Main function used by all other callers to render/update display of a tag component */
-export function renderSupport(support, // must be latest/newest state render
-renderUp) {
+export function renderSupport(support) {
     const global = support.subject.global;
     const templater = support.templater;
-    // is it just a vanilla tag, not component?
-    if (!templater.wrapper) { // || isTagTemplater(templater) 
-        const ownerTag = support.ownerSupport;
-        ++global.renderCount;
-        if (ownerTag.subject.global.deleted) {
-            return support;
-        }
-        return renderSupport(ownerTag.subject.global.newest, true);
-    }
-    if (support.subject.global.locked) {
-        support.subject.global.blocked.push(support);
+    const inlineHtml = isInlineHtml(templater);
+    const ownerSupport = support.ownerSupport;
+    if (global.locked) {
+        global.blocked.push(support);
         return support;
     }
+    // is it just a vanilla tag, not component?
+    if (inlineHtml) {
+        return renderInlineHtml(ownerSupport, support);
+    }
+    global.locked = true;
     const subject = support.subject;
-    const oldest = support.subject.global.oldest;
-    let ownerSupport;
-    let selfPropChange = false;
-    const shouldRenderUp = renderUp && support;
-    if (shouldRenderUp) {
-        ownerSupport = support.ownerSupport;
-        if (ownerSupport) {
-            const nowProps = templater.props;
-            const latestProps = support.propsConfig.latestCloned;
-            selfPropChange = !deepEqual(nowProps, latestProps);
-        }
-    }
-    const tag = renderExistingTag(oldest, support, ownerSupport, // useSupport,
-    subject);
-    if (ownerSupport && selfPropChange) {
-        const myOwnerSupport = ownerSupport.subject.global.newest;
-        renderSupport(myOwnerSupport, true);
-        return tag;
+    if (global.blocked.length) {
+        support = global.blocked.pop();
+        global.blocked = [];
     }
+    delete global.locked;
+    const tag = renderExistingReadyTag(global.newest, support, ownerSupport, subject);
     return tag;
 }
+export function renderInlineHtml(ownerSupport, support) {
+    const ownGlobal = ownerSupport.subject.global;
+    if (!ownGlobal || ownGlobal.deleted === true) {
+        return support;
+    }
+    // ??? new change
+    const newest = ownGlobal.newest || ownerSupport;
+    const result = renderSupport(newest);
+    return result;
+}
+export function checkRenderUp(ownerSupport, templater, support) {
+    const selfPropChange = hasPropsToOwnerChanged(templater, support);
+    // render owner up first and that will cause me to re-render
+    if (ownerSupport && selfPropChange) {
+        return true;
+    }
+    return false;
+}
+function hasPropsToOwnerChanged(templater, support) {
+    const nowProps = templater.props;
+    const propsConfig = support.propsConfig;
+    const latestProps = propsConfig.latest;
+    const compareLen = hasPropLengthsChanged(nowProps, latestProps);
+    if (compareLen) {
+        return true;
+    }
+    switch (templater.propWatch) {
+        case PropWatches.IMMUTABLE:
+            return immutablePropMatch(nowProps, latestProps);
+        case PropWatches.SHALLOW:
+            return shallowPropMatch(nowProps, latestProps);
+    }
+    return !deepEqual(nowProps, latestProps, deepCompareDepth);
+}
+export function hasPropLengthsChanged(nowProps, latestProps) {
+    const nowLen = nowProps.length;
+    const latestLen = latestProps.length;
+    /*
+    const noLength = nowProps && nowLen === 0 && latestLen === 0
+  
+    if(noLength) {
+      return false
+    }
+    */
+    return nowLen !== latestLen;
+}
 //# sourceMappingURL=renderSupport.function.js.map

package/js/tag/render/renderSupport.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderSupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderSupport.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAGlE,0FAA0F;AAC1F,MAAM,UAAU,aAAa,CAC3B,OAAU,EAAE,qCAAqC;AACjD,QAAiB;IAEjB,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;IAEnC,2CAA2C;IAC3C,IAAI,CAAC,SAAS,CAAC,OAAO,EAAG,CAAC,CAAA,gCAAgC;QACxD,MAAM,QAAQ,GAAI,OAAmB,CAAC,YAAY,CAAA;QAClD,EAAE,MAAM,CAAC,WAAW,CAAA;QACpB,IAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACnC,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAiB,EAAE,IAAI,CAAM,CAAA;IAC5E,CAAC;IAED,IAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC5C,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAA;IAE5C,IAAI,YAAoC,CAAA;IACxC,IAAI,cAAc,GAAG,KAAK,CAAA;IAC1B,MAAM,cAAc,GAAG,QAAQ,IAAI,OAAO,CAAA;IAE1C,IAAG,cAAc,EAAE,CAAC;QAClB,YAAY,GAAI,OAAmB,CAAC,YAAY,CAAA;QAChD,IAAG,YAAY,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAc,CAAA;YACzC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,CAAA;YACpD,cAAc,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QACpD,CAAC;IACH,CAAC;IAED,MAAM,GAAG,GAAG,iBAAiB,CAC3B,MAAM,EACN,OAAO,EACP,YAAuB,EAAE,cAAc;IACvC,OAAO,CACR,CAAA;IAED,IAAG,YAAY,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,MAAiB,CAAA;QACpE,aAAa,CACX,cAAc,EACd,IAAI,CACL,CAAA;QAED,OAAO,GAAQ,CAAA;IACjB,CAAC;IAED,OAAO,GAAQ,CAAA;AACjB,CAAC"}
+{"version":3,"file":"renderSupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderSupport.function.ts"],"names":[],"mappings":"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"}

package/js/tag/render/renderTagOnly.function.d.ts

@@ -1,3 +1,4 @@
-import { BaseSupport, Support } from '../Support.class.js';
-import { TagSubject } from '../../subject.types.js';
-export declare function renderTagOnly(newSupport: Support | BaseSupport, prevSupport: Support | BaseSupport | undefined, subject: TagSubject, ownerSupport?: Support | BaseSupport): Support;
+import { AnySupport } from '../Support.class.js';
+import { ContextItem } from '../Context.types.js';
+export declare function renderTagOnly(newSupport: AnySupport, prevSupport: AnySupport | undefined, // causes restate
+subject: ContextItem, ownerSupport?: AnySupport): AnySupport;

package/js/tag/render/renderTagOnly.function.js

@@ -1,38 +1,47 @@
-import { runBeforeRedraw, runBeforeRender } from '../tagRunner.js';
+import { getSupport } from '../Support.class.js';
 import { runAfterRender } from '../tagRunner.js';
-export function renderTagOnly(newSupport, prevSupport, subject, ownerSupport) {
-    const oldRenderCount = subject.global.renderCount;
-    beforeWithRender(newSupport, ownerSupport, prevSupport);
+import { ValueTypes } from '../ValueTypes.enum.js';
+import { executeWrap } from '../executeWrap.function.js';
+import { initState, reState } from '../../state/state.utils.js';
+import { setUseMemory } from '../../state/setUse.function.js';
+export function renderTagOnly(newSupport, prevSupport, // causes restate
+subject, ownerSupport) {
+    const global = subject.global;
+    const oldRenderCount = global.renderCount;
+    beforeWithRender(newSupport, prevSupport?.state);
     const templater = newSupport.templater;
+    let reSupport;
     // NEW TAG CREATED HERE
-    const wrapper = templater.wrapper;
-    let reSupport = wrapper(newSupport, subject, prevSupport);
+    if (templater.tagJsType === ValueTypes.stateRender) {
+        const result = templater; // .wrapper as any// || {original: templater} as any
+        const useSupport = getSupport(templater, ownerSupport, newSupport.appSupport, // ownerSupport.appSupport as Support,
+        subject);
+        reSupport = executeWrap(templater, result, useSupport);
+    }
+    else {
+        // functions wrapped in tag()
+        const wrapper = templater.wrapper;
+        // calls the function returned from getTagWrap()
+        reSupport = wrapper(newSupport, subject, prevSupport);
+    }
     /* AFTER */
     runAfterRender(newSupport, ownerSupport);
-    subject.global.newest = reSupport;
-    if (!prevSupport && ownerSupport) {
-        ownerSupport.subject.global.childTags.push(reSupport);
-    }
+    global.newest = reSupport;
     // When we rendered, only 1 render should have taken place OTHERWISE rendering caused another render and that is the latest instead
-    if (subject.global.renderCount > oldRenderCount + 1) {
-        return subject.global.newest;
+    if (global.renderCount > oldRenderCount + 1) {
+        return global.newest;
     }
     return reSupport;
 }
 function beforeWithRender(support, // new
-parentSupport, prevSupport) {
-    const lastOwnerSupport = prevSupport?.ownerSupport;
-    const runtimeOwnerSupport = lastOwnerSupport || parentSupport;
-    if (prevSupport) {
-        if (prevSupport !== support) {
-            const lastState = prevSupport.state;
-            support.subject.global = prevSupport.subject.global;
-            support.state.length = 0;
-            support.state.push(...lastState);
-        }
-        return runBeforeRedraw(support, prevSupport);
+prevState) {
+    if (prevState) {
+        const lastState = prevState;
+        support.state = lastState;
+        reState(support, setUseMemory.stateConfig);
+        return;
     }
     // first time render
-    return runBeforeRender(support, runtimeOwnerSupport);
+    initState(support, setUseMemory.stateConfig);
 }
 //# sourceMappingURL=renderTagOnly.function.js.map

package/js/tag/render/renderTagOnly.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderTagOnly.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderTagOnly.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAK,iBAAiB,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAK,iBAAiB,CAAA;AAI/C,MAAM,UAAU,aAAa,CAC3B,UAAiC,EACjC,WAA8C,EAC9C,OAAmB,EACnB,YAAoC;IAEpC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAA;IAEjD,gBAAgB,CAAC,UAAU,EAAE,YAAY,EAAE,WAAW,CAAC,CAAA;IAEvD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;IAEtC,uBAAuB;IACvB,MAAM,OAAO,GAAG,SAAS,CAAC,OAAkB,CAAA;IAC5C,IAAI,SAAS,GAAG,OAAO,CACrB,UAAU,EACV,OAAO,EACP,WAAW,CACZ,CAAA;IACD,WAAW;IAEX,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IAExC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAA;IACjC,IAAG,CAAC,WAAW,IAAI,YAAY,EAAE,CAAC;QAChC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,mIAAmI;IACnI,IAAG,OAAO,CAAC,MAAM,CAAC,WAAW,GAAG,cAAc,GAAG,CAAC,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAiB,CAAA;IACzC,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA8B,EAAE,MAAM;AACtC,aAAqC,EACrC,WAAmC;IAEnC,MAAM,gBAAgB,GAAI,WAAuB,EAAE,YAAY,CAAA;IAC/D,MAAM,mBAAmB,GAA2B,gBAAgB,IAAI,aAAa,CAAA;IAErF,IAAG,WAAW,EAAE,CAAC;QACf,IAAG,WAAW,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAA;YACnC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAA;YACnD,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;YACxB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAC9C,CAAC;IAED,oBAAoB;IACpB,OAAO,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;AACtD,CAAC"}
+{"version":3,"file":"renderTagOnly.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderTagOnly.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,UAAU,EAAW,MAAM,qBAAqB,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAK,iBAAiB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAG7D,MAAM,UAAU,aAAa,CAC3B,UAAsB,EACtB,WAAmC,EAAE,iBAAiB;AACtD,OAAoB,EACpB,YAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,CAAC,MAA0B,CAAA;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAA;IAEzC,gBAAgB,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,CAAC,CAAA;IAEhD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;IACtC,IAAI,SAAqB,CAAA;IAEzB,uBAAuB;IACvB,IAAG,SAAS,CAAC,SAAS,KAAK,UAAU,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,SAAmC,CAAA,CAAC,oDAAoD;QAEvG,MAAM,UAAU,GAAG,UAAU,CAC3B,SAAS,EACT,YAA0B,EAC1B,UAAU,CAAC,UAAU,EAAE,sCAAsC;QAC7D,OAAO,CACR,CAAA;QAED,SAAS,GAAG,WAAW,CACrB,SAAS,EACT,MAAM,EACN,UAAU,CACX,CAAA;IACH,CAAC;SAAM,CAAC;QACN,6BAA6B;QAC7B,MAAM,OAAO,GAAG,SAAS,CAAC,OAAkB,CAAA;QAE5C,gDAAgD;QAChD,SAAS,GAAG,OAAO,CACjB,UAAU,EACV,OAAO,EACP,WAAW,CACZ,CAAA;IACH,CAAC;IAED,WAAW;IAEX,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IAExC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAA;IAEzB,mIAAmI;IACnI,IAAG,MAAM,CAAC,WAAW,GAAG,cAAc,GAAG,CAAC,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC,MAAiB,CAAA;IACjC,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA8B,EAAE,MAAM;AACtC,SAAiB;IAGjB,IAAG,SAAS,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,SAAS,CAAA;QAC3B,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;QAEzB,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;QAC1C,OAAM;IACR,CAAC;IAED,oBAAoB;IACpB,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAA;AAC9C,CAAC"}

package/js/tag/render/renderWithSupport.function.d.ts

@@ -1,5 +1,9 @@
-import { BaseSupport, Support } from '../Support.class.js';
-import { TagSubject } from '../../subject.types.js';
+import { AnySupport, BaseSupport, Support } from '../Support.class.js';
+import { ContextItem } from '../Context.types.js';
+/** TODO: This seems to support both new and updates and should be separated? */
 export declare function renderWithSupport(newSupport: Support | BaseSupport, lastSupport: Support | BaseSupport | undefined, // previous
-subject: TagSubject, // events & memory
-ownerSupport?: BaseSupport | Support): Support;
+subject: ContextItem, // events & memory
+ownerSupport?: BaseSupport | Support): {
+    support: AnySupport;
+    wasLikeTags: boolean;
+};

package/js/tag/render/renderWithSupport.function.js

@@ -1,9 +1,9 @@
 import { isLikeTags } from '../isLikeTags.function.js';
 import { renderTagOnly } from './renderTagOnly.function.js';
-import { destroyUnlikeTags } from './destroyUnlikeTags.function.js';
 import { softDestroySupport } from './softDestroySupport.function.js';
 import { ValueTypes } from '../ValueTypes.enum.js';
-import { deepEqual } from '../../deepFunctions.js';
+import { moveProviders } from '../update/updateExistingTagComponent.function.js';
+/** TODO: This seems to support both new and updates and should be separated? */
 export function renderWithSupport(newSupport, lastSupport, // previous
 subject, // events & memory
 ownerSupport) {
@@ -12,31 +12,33 @@ ownerSupport) {
     const reSupport = renderTagOnly(newSupport, lastSupport, subject, ownerSupport);
     const isLikeTag = !lastSupport || isLikeTags(lastSupport, reSupport);
     if (!isLikeTag) {
-        destroyUnlikeTags(lastSupport, reSupport, subject);
+        moveProviders(lastSupport, reSupport);
+        softDestroySupport(lastSupport);
+        const global = reSupport.subject.global;
+        global.oldest = reSupport;
+        global.newest = reSupport;
     }
     else if (lastSupport) {
-        const tag = reSupport.templater.tag;
-        if (tag) {
+        const tag = lastSupport.templater.tag;
+        const global = subject.global;
+        if (tag && global.renderCount > 1) {
             checkTagSoftDestroy(tag, lastSupport, lastTag);
         }
     }
     const lastOwnerSupport = lastSupport?.ownerSupport;
     reSupport.ownerSupport = (ownerSupport || lastOwnerSupport);
-    return reSupport;
+    return { support: reSupport, wasLikeTags: isLikeTag };
 }
 function checkTagSoftDestroy(tag, lastSupport, lastTag) {
     if (tag.tagJsType === ValueTypes.dom) {
         const lastDom = lastTag?.dom;
         const newDom = tag.dom;
-        if (!deepEqual(lastDom, newDom)) {
+        if (lastDom !== newDom) {
             softDestroySupport(lastSupport);
         }
         return;
     }
     if (lastTag) {
-        if (lastTag.tagJsType === ValueTypes.dom) {
-            throw new Error('check here');
-        }
         const lastStrings = lastTag.strings;
         if (lastStrings) {
             const oldLength = lastStrings?.length;

package/js/tag/render/renderWithSupport.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderWithSupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderWithSupport.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAK,2BAA2B,CAAA;AAErD,OAAO,EAAE,aAAa,EAAE,MAAK,6BAA6B,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAK,iCAAiC,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,UAAU,iBAAiB,CAC/B,UAAiC,EACjC,WAA8C,EAAE,WAAW;AAC3D,OAAmB,EAAE,kBAAkB;AACvC,YAAoC;IAEpC,MAAM,aAAa,GAAG,WAAW,EAAE,SAAS,CAAA;IAC5C,MAAM,OAAO,GAAG,aAAa,EAAE,GAAG,CAAA;IAElC,MAAM,SAAS,GAAG,aAAa,CAC7B,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,CAC/C,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IACpE,IAAG,CAAC,SAAS,EAAE,CAAC;QACd,iBAAiB,CACf,WAAW,EACX,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC;SAAM,IAAG,WAAW,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAA;QAEnC,IAAG,GAAG,EAAE,CAAC;YACP,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QAChD,CAAC;IACH,CAAC;IAGD,MAAM,gBAAgB,GAAI,WAAuB,EAAE,YAAY,CAAA;IAC/D,SAAS,CAAC,YAAY,GAAG,CAAC,YAAY,IAAI,gBAAgB,CAAY,CAAA;IAEtE,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAAc,EACd,WAAuB,EACvB,OAAmB;IAEnB,IAAG,GAAG,CAAC,SAAS,KAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,OAAO,GAAI,OAAe,EAAE,GAAG,CAAA;QACrC,MAAM,MAAM,GAAI,GAAW,CAAC,GAAG,CAAA;QAC/B,IAAG,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YAC/B,kBAAkB,CAAC,WAAW,CAAC,CAAA;QACjC,CAAC;QAED,OAAM;IACR,CAAC;IAED,IAAG,OAAO,EAAE,CAAC;QACX,IAAG,OAAO,CAAC,SAAS,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,WAAW,GAAI,OAAe,CAAC,OAAO,CAAA;QAC5C,IAAG,WAAW,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,WAAW,EAAE,MAAM,CAAA;YACrC,MAAM,SAAS,GAAI,GAAW,CAAC,OAAO,CAAC,MAAM,CAAA;YAC7C,IAAG,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC3B,kBAAkB,CAAC,WAAW,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"renderWithSupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/renderWithSupport.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAK,2BAA2B,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAK,6BAA6B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAA;AAGhF,gFAAgF;AAChF,MAAM,UAAU,iBAAiB,CAC/B,UAAiC,EACjC,WAA8C,EAAE,WAAW;AAC3D,OAAoB,EAAE,kBAAkB;AACxC,YAAoC;IAEpC,MAAM,aAAa,GAAG,WAAW,EAAE,SAAS,CAAA;IAC5C,MAAM,OAAO,GAAG,aAAa,EAAE,GAAG,CAAA;IAElC,MAAM,SAAS,GAAG,aAAa,CAC7B,UAAU,EACV,WAAW,EACX,OAAO,EACP,YAAY,CACb,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IACpE,IAAG,CAAC,SAAS,EAAE,CAAC;QACd,aAAa,CAAC,WAAsB,EAAE,SAAS,CAAC,CAAA;QAChD,kBAAkB,CAAC,WAAW,CAAC,CAAA;QAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,MAA0B,CAAA;QAC3D,MAAM,CAAC,MAAM,GAAG,SAAS,CAAA;QACzB,MAAM,CAAC,MAAM,GAAG,SAAS,CAAA;IAC3B,CAAC;SAAM,IAAG,WAAW,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAA;QACrC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAmB,CAAA;QAC1C,IAAG,GAAG,IAAI,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;YACjC,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QAChD,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAI,WAAuB,EAAE,YAAY,CAAA;IAC/D,SAAS,CAAC,YAAY,GAAG,CAAC,YAAY,IAAI,gBAAgB,CAAY,CAAA;IAEtE,OAAO,EAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,CAAA;AACrD,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAAuB,EACvB,WAAuB,EACvB,OAA4B;IAE5B,IAAG,GAAG,CAAC,SAAS,KAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,OAAO,GAAI,OAAkB,EAAE,GAAG,CAAA;QACxC,MAAM,MAAM,GAAI,GAAc,CAAC,GAAG,CAAA;QAClC,IAAG,OAAO,KAAK,MAAM,EAAE,CAAC;YACtB,kBAAkB,CAAC,WAAW,CAAC,CAAA;QACjC,CAAC;QAED,OAAM;IACR,CAAC;IAED,IAAG,OAAO,EAAE,CAAC;QACX,MAAM,WAAW,GAAI,OAAqB,CAAC,OAAO,CAAA;QAClD,IAAG,WAAW,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,WAAW,EAAE,MAAM,CAAA;YACrC,MAAM,SAAS,GAAI,GAAiB,CAAC,OAAO,CAAC,MAAM,CAAA;YACnD,IAAG,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC3B,kBAAkB,CAAC,WAAW,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/js/tag/render/softDestroySupport.function.d.ts

@@ -1,4 +1,3 @@
 import { BaseSupport, Support } from '../Support.class.js';
-import { DestroyOptions } from '../destroy.support.js';
 /** used when a tag swaps content returned */
-export declare function softDestroySupport(lastSupport: BaseSupport | Support, options?: DestroyOptions): void;
+export declare function softDestroySupport(lastSupport: BaseSupport | Support): void;

package/js/tag/render/softDestroySupport.function.js

@@ -1,22 +1,26 @@
-import { resetSupport } from '../Support.class.js';
-import { getChildTagsToDestroy } from '../destroy.support.js';
+import { getChildTagsToSoftDestroy } from '../getChildTagsToDestroy.function.js';
+import { smartRemoveKids } from '../smartRemoveKids.function.js';
+import { getNewGlobal } from '../update/getNewGlobal.function.js';
 /** used when a tag swaps content returned */
-export function softDestroySupport(lastSupport, options = { byParent: false, stagger: 0 }) {
+export function softDestroySupport(lastSupport) {
     const global = lastSupport.subject.global;
-    global.deleted = true;
-    // global.context = {}
-    global.context = [];
-    const childTags = getChildTagsToDestroy(global.childTags);
-    lastSupport.destroySubscriptions();
-    childTags.forEach(child => {
-        const subGlobal = child.subject.global;
-        delete subGlobal.newest;
-        subGlobal.deleted = true;
-    });
-    lastSupport.smartRemoveKids();
-    lastSupport.subject.global.clones.length = 0; // tag maybe used for something else
-    lastSupport.subject.global.childTags.length = 0; // tag maybe used for something else
-    resetSupport(lastSupport);
-    childTags.forEach(child => softDestroySupport(child, { byParent: true, stagger: 0 }));
+    const { subs, tags } = getChildTagsToSoftDestroy(global.context);
+    softDestroyOne(lastSupport);
+    for (const child of tags) {
+        softDestroyOne(child);
+    }
+    const mySubs = global.subscriptions;
+    if (mySubs) {
+        subs.forEach(sub => sub.unsubscribe());
+    }
+    lastSupport.subject.global = getNewGlobal();
+}
+function softDestroyOne(child) {
+    const global = child.subject.global;
+    if (global.deleted === true) {
+        return;
+    }
+    global.deleted = true; // the children are truly destroyed but the main support will be swapped
+    smartRemoveKids(child, [], 0);
 }
 //# sourceMappingURL=softDestroySupport.function.js.map

package/js/tag/render/softDestroySupport.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"softDestroySupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/softDestroySupport.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAkB,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAE7E,6CAA6C;AAC7C,MAAM,UAAU,kBAAkB,CAChC,WAAkC,EAClC,UAA0B,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAC;IAEvD,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAA;IACzC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;IACrB,sBAAsB;IACtB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,MAAM,SAAS,GAAG,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAEzD,WAAW,CAAC,oBAAoB,EAAE,CAAA;IAElC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAA;QACtC,OAAO,SAAS,CAAC,MAAM,CAAA;QACvB,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;IAC1B,CAAC,CAAC,CAAA;IAEF,WAAW,CAAC,eAAe,EAAE,CAAA;IAC7B,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,oCAAoC;IACjF,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,oCAAoC;IAEpF,YAAY,CAAC,WAAW,CAAC,CAAA;IACzB,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAC,CAAC,CAAC,CAAA;AACrF,CAAC"}
+{"version":3,"file":"softDestroySupport.function.js","sourceRoot":"","sources":["../../../ts/tag/render/softDestroySupport.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AAEjE,6CAA6C;AAC7C,MAAM,UAAU,kBAAkB,CAChC,WAAkC;IAElC,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAA0B,CAAA;IAC7D,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,yBAAyB,CAAC,MAAM,CAAC,OAAkB,CAAC,CAAA;IAEzE,cAAc,CAAC,WAAW,CAAC,CAAA;IAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,cAAc,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAA;IACnC,IAAG,MAAM,EAAE,CAAC;QACV,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,EAAiC,CAAA;AAC5E,CAAC;AAED,SAAS,cAAc,CACrB,KAAiB;IAEjB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAmB,CAAA;IAEhD,IAAG,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC3B,OAAM;IACR,CAAC;IAED,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,wEAAwE;IAC9F,eAAe,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;AAC/B,CAAC"}

package/js/tag/smartRemoveKids.function.d.ts

@@ -0,0 +1,3 @@
+import { AnySupport } from './Support.class.js';
+/** sets global.deleted on support and all children */
+export declare function smartRemoveKids(support: AnySupport, promises: Promise<any>[], stagger: number): number;

package/js/tag/smartRemoveKids.function.js

@@ -0,0 +1,80 @@
+import { destroyArray } from './checkDestroyPrevious.function.js';
+import { elementDestroyCheck } from './elementDestroyCheck.function.js';
+import { paint, paintRemoves } from './paint.function.js';
+import { isPromise } from '../isInstance.js';
+/** sets global.deleted on support and all children */
+export function smartRemoveKids(support, promises, stagger) {
+    const startStagger = stagger;
+    const subject = support.subject;
+    const thisGlobal = subject.global;
+    const htmlDomMeta = thisGlobal.htmlDomMeta;
+    const context = thisGlobal.context;
+    thisGlobal.deleted = true;
+    for (const subject of context) {
+        if (subject.withinOwnerElement) {
+            continue; // i live within my owner variable. I will be deleted with owner
+        }
+        const lastArray = subject.lastArray;
+        if (lastArray) {
+            destroyArray(subject, lastArray);
+            continue;
+        }
+        // regular values, no placeholders
+        const elm = subject.simpleValueElm;
+        if (elm) {
+            delete subject.simpleValueElm;
+            paintRemoves.push(elm);
+            continue;
+        }
+        const global = subject.global;
+        if (global === undefined) {
+            continue; // subject
+        }
+        if (global.deleted === true) {
+            continue;
+        }
+        global.deleted = true;
+        const oldest = global.oldest;
+        if (oldest) {
+            // recurse
+            stagger = stagger + smartRemoveKids(oldest, promises, stagger);
+            continue;
+        }
+    }
+    destroyClones(htmlDomMeta, startStagger, promises);
+    return stagger;
+}
+function destroyClones(oldClones, stagger, promises) {
+    // check subjects that may have clones attached to them
+    const newPromises = oldClones.map(clone => {
+        const marker = clone.marker;
+        if (marker) {
+            paintRemoves.push(marker);
+        }
+        const dom = clone.domElement;
+        if (!dom) {
+            return;
+        }
+        return checkCloneRemoval(dom, stagger);
+    }).filter(x => x); // only return promises
+    if (newPromises.length) {
+        promises.push(Promise.all(newPromises));
+        return stagger;
+    }
+    return stagger;
+}
+/** Reviews elements for the presences of ondestroy */
+function checkCloneRemoval(clone, stagger) {
+    const customElm = clone;
+    if (customElm.ondestroy) {
+        const promise = elementDestroyCheck(customElm, stagger);
+        if (isPromise(promise)) {
+            return promise.then(() => {
+                paintRemoves.push(clone);
+                paint();
+            });
+        }
+    }
+    paintRemoves.push(clone);
+}
+//# sourceMappingURL=smartRemoveKids.function.js.map

package/js/tag/smartRemoveKids.function.js.map

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

package/js/tag/tag.d.ts

@@ -1,14 +1,27 @@
-import { Dom, Tag } from './Tag.class.js';
+import { DomTag, StringTag } from './Tag.class.js';
 import { RouteProps, RouteTag, StateToTag, ToTag } from './tag.types.js';
 export type TaggedFunction<T> = T & {
     original: Function;
 };
+export declare enum PropWatches {
+    DEEP = "deep",
+    SHALLOW = "shallow",
+    NONE = "none",
+    IMMUTABLE = "immutable"
+}
 /** Wraps a function tag in a state manager and calls wrapped function on event cycles
  * For single rendering, no event cycles, use: tag.renderOnce = (props) => html``
  */
-export declare function tag<T extends ToTag>(tagComponent: T): TaggedFunction<T>;
+export declare function tag<T extends ToTag>(tagComponent: T, propWatch?: PropWatches): TaggedFunction<T>;
 export declare namespace tag {
-    var oneRender: (...props: any[]) => Tag | Dom | StateToTag;
+    var renderOnce: () => ReturnTag;
+    var state: () => ReturnTag;
     var route: (routeProps: RouteProps) => StateToTag;
+    var key: typeof import("./key.js").key;
     var app: (routeTag: RouteTag) => StateToTag;
+    var deepPropWatch: typeof tag;
+    var immutableProps: <T extends ToTag>(tagComponent: T) => TaggedFunction<T>;
+    var watchProps: <T extends ToTag>(tagComponent: T) => TaggedFunction<T>;
 }
+type ReturnTag = DomTag | StringTag | StateToTag | null | undefined;
+export {};