taggedjs 2.4.16 → 2.4.31

package/js/TagSupport.class.js

@@ -1,64 +1,302 @@
+import { escapeVariable, variablePrefix } from './Tag.class';
 import { deepClone } from './deepFunctions';
-import { isTagArray, isTagComponent, isTagInstance } from './isInstance';
+import { isTagClass, isTagComponent, isTagTemplater } from './isInstance';
+import { cloneValueArray } from './cloneValueArray.function';
+import { restoreTagMarker } from './checkDestroyPrevious.function';
+import { runBeforeDestroy } from './tagRunner';
+import { getChildTagsToDestroy } from './destroy.support';
+import { elementDestroyCheck } from './elementDestroyCheck.function';
+import { updateContextItem } from './updateContextItem.function';
+import { processNewValue } from './processNewValue.function';
+import { setTagPlaceholder } from './setTagPlaceholder.function';
+import { interpolateElement, interpolateString } from './interpolations/interpolateElement';
+import { subscribeToTemplate } from './interpolations/interpolateTemplate';
+import { afterInterpolateElement } from './afterInterpolateElement.function';
+const prefixSearch = new RegExp(variablePrefix, 'g');
+/** used only for apps, otherwise use TagSupport */
 export class BaseTagSupport {
     templater;
     subject;
     isApp = true;
+    appElement; // only seen on this.getAppElement().appElement
     propsConfig;
+    // stays with current render
     memory = {
         // context: {}, // populated after reading interpolated.values array converted to an object {variable0, variable:1}
-        state: {
-            newest: [],
-        },
+        state: [],
+    };
+    // travels with all rerenderings
+    global = {
+        context: {}, // populated after reading interpolated.values array converted to an object {variable0, variable:1}
+        providers: [],
+        /** Indicator of re-rending. Saves from double rending something already rendered */
+        renderCount: 0,
+        deleted: false,
+        subscriptions: []
     };
     constructor(templater, subject) {
         this.templater = templater;
         this.subject = subject;
-        const children = this.templater.children; // children tags passed in as arguments
-        const props = this.templater.props; // natural props
-        const latestCloned = deepClone(props); // alterProps(props, templater)
+        const children = templater.children; // children tags passed in as arguments
+        const kidValue = children.value;
+        const props = templater.props; // natural props
+        const latestCloned = deepClone(props);
         this.propsConfig = {
             latest: props,
             latestCloned, // assume its HTML children and then detect
-            clonedProps: latestCloned, // maybe duplicate
-            lastClonedKidValues: children.value.map(kid => {
+            lastClonedKidValues: kidValue.map(kid => {
                 const cloneValues = cloneValueArray(kid.values);
                 return cloneValues;
             })
         };
         // if the latest props are not HTML children, then clone the props for later render cycles to compare
-        if (!isTagInstance(props)) {
+        if (!isTagTemplater(props) && !isTagClass(props)) {
             this.propsConfig.latestCloned = deepClone(latestCloned);
-            this.propsConfig.clonedProps = this.propsConfig.latestCloned;
         }
     }
 }
-function cloneValueArray(values) {
-    return values.map((value) => {
-        const tag = value;
-        if (isTagInstance(tag)) {
-            return cloneValueArray(tag.values);
-        }
-        if (isTagComponent(tag)) {
-            const tagComponent = tag;
-            return deepClone(tagComponent.props);
-        }
-        if (isTagArray(tag)) {
-            return cloneValueArray(tag);
-        }
-        return deepClone(value);
-    });
-}
 export class TagSupport extends BaseTagSupport {
-    ownerTagSupport;
     templater;
+    ownerTagSupport;
     subject;
+    version;
     isApp = false;
-    constructor(ownerTagSupport, templater, subject) {
+    hasLiveElements = false;
+    childTags = []; // tags on me
+    clones = []; // elements on document. Needed at destroy process to know what to destroy
+    // may not be needed anymore?
+    strings;
+    values;
+    lastTemplateString = undefined; // used to compare templates for updates
+    constructor(templater, // at runtime rendering of a tag, it needs to be married to a new TagSupport()
+    ownerTagSupport, subject, version = 0) {
         super(templater, subject);
-        this.ownerTagSupport = ownerTagSupport;
         this.templater = templater;
+        this.ownerTagSupport = ownerTagSupport;
         this.subject = subject;
+        this.version = version;
+    }
+    destroy(options = {
+        stagger: 0,
+        byParent: false, // Only destroy clones of direct children
+    }) {
+        const global = this.global;
+        const subject = this.subject;
+        // put back down the template tag
+        const insertBefore = global.insertBefore;
+        if (insertBefore.nodeName === 'TEMPLATE') {
+            const placeholder = global.placeholder;
+            if (placeholder && !('arrayValue' in this.memory)) {
+                if (!options.byParent) {
+                    restoreTagMarker(this, insertBefore);
+                }
+            }
+        }
+        delete global.placeholder;
+        // the isComponent check maybe able to be removed
+        const isComponent = isTagComponent(this) ? true : false;
+        if (isComponent) {
+            runBeforeDestroy(this, this);
+        }
+        const childTags = options.byParent ? [] : getChildTagsToDestroy(this.childTags);
+        // signify that no further event rendering should take place by making logic think a render occurred during event
+        // signify immediately child has been deleted (looked for during event processing)
+        childTags.forEach(child => {
+            const subGlobal = child.global;
+            delete subGlobal.newest;
+            subGlobal.deleted = true;
+        });
+        delete global.oldest;
+        delete global.newest;
+        global.deleted = true;
+        this.hasLiveElements = false;
+        delete subject.tagSupport;
+        this.destroySubscriptions();
+        let mainPromise;
+        if (this.ownerTagSupport) {
+            this.ownerTagSupport.childTags = this.ownerTagSupport.childTags.filter(child => child !== this);
+        }
+        if (!options.byParent) {
+            const { stagger, promise } = this.destroyClones(options);
+            options.stagger = stagger;
+            if (promise) {
+                mainPromise = promise;
+            }
+        }
+        else {
+            this.destroyClones();
+        }
+        if (mainPromise) {
+            mainPromise = mainPromise.then(async () => {
+                const promises = childTags.map(kid => kid.destroy({ stagger: 0, byParent: true }));
+                return Promise.all(promises);
+            });
+        }
+        else {
+            mainPromise = Promise.all(childTags.map(kid => kid.destroy({ stagger: 0, byParent: true })));
+        }
+        return mainPromise.then(() => options.stagger);
+    }
+    destroySubscriptions() {
+        const global = this.global;
+        global.subscriptions.forEach(cloneSub => cloneSub.unsubscribe());
+        global.subscriptions.length = 0;
+    }
+    destroyClones({ stagger } = {
+        stagger: 0,
+    }) {
+        //const promises = this.clones.reverse().map(
+        const promises = this.clones.map(clone => this.checkCloneRemoval(clone, stagger)).filter(x => x); // only return promises
+        this.clones.length = 0; // tag maybe used for something else
+        if (promises.length) {
+            return { promise: Promise.all(promises), stagger };
+        }
+        return { stagger };
+    }
+    /** Reviews elements for the presences of ondestroy */
+    checkCloneRemoval(clone, stagger) {
+        let promise;
+        const customElm = clone;
+        if (customElm.ondestroy) {
+            promise = elementDestroyCheck(customElm, stagger);
+        }
+        const next = () => {
+            clone.parentNode?.removeChild(clone);
+            const ownerSupport = this.ownerTagSupport;
+            if (ownerSupport) {
+                // Sometimes my clones were first registered to my owner, remove them from owner
+                ownerSupport.clones = ownerSupport.clones.filter(compareClone => compareClone !== clone);
+            }
+        };
+        if (promise instanceof Promise) {
+            return promise.then(next);
+        }
+        else {
+            next();
+        }
+        return promise;
+    }
+    update() {
+        return this.updateContext(this.global.context);
+    }
+    updateBy(tagSupport) {
+        const tempTag = tagSupport.templater.tag;
+        this.updateConfig(tempTag.strings, tempTag.values);
+    }
+    updateConfig(strings, values) {
+        this.strings = strings;
+        this.updateValues(values);
+    }
+    updateValues(values) {
+        this.values = values;
+        return this.updateContext(this.global.context);
+    }
+    updateContext(context) {
+        const thisTag = this.templater.tag;
+        const strings = this.strings || thisTag.strings;
+        const values = this.values || thisTag.values;
+        strings.map((_string, index) => {
+            const variableName = variablePrefix + index;
+            const hasValue = values.length > index;
+            const value = values[index];
+            // is something already there?
+            const exists = variableName in context;
+            if (exists) {
+                return updateContextItem(context, variableName, value);
+            }
+            if (!hasValue) {
+                return;
+            }
+            // 🆕 First time values below
+            context[variableName] = processNewValue(hasValue, value, this);
+        });
+        return context;
+    }
+    /** Function that kicks off actually putting tags down as HTML elements */
+    buildBeforeElement(insertBefore, options = {
+        forceElement: false,
+        counts: { added: 0, removed: 0 },
+    }) {
+        const subject = this.subject;
+        const global = this.global;
+        global.insertBefore = insertBefore;
+        if (!global.placeholder) {
+            setTagPlaceholder(global);
+        }
+        const placeholderElm = global.placeholder;
+        global.oldest = this;
+        global.newest = this;
+        subject.tagSupport = this;
+        this.hasLiveElements = true;
+        // remove old clones
+        if (this.clones.length) {
+            this.clones.forEach(clone => this.checkCloneRemoval(clone, 0));
+        }
+        global.insertBefore = insertBefore;
+        const context = this.update();
+        const template = this.getTemplate();
+        const elementContainer = document.createElement('div');
+        elementContainer.id = 'tag-temp-holder';
+        // render content with a first child that we can know is our first element
+        elementContainer.innerHTML = `<template id="temp-template-tag-wrap">${template.string}</template>`;
+        // Search/replace innerHTML variables but don't interpolate tag components just yet
+        const { tagComponents } = interpolateElement(elementContainer, context, template, this, // ownerSupport,
+        {
+            forceElement: options.forceElement,
+            counts: options.counts
+        });
+        afterInterpolateElement(elementContainer, placeholderElm, this, // ownerSupport
+        context, options);
+        // Any tag components that were found should be processed AFTER the owner processes its elements. Avoid double processing of elements attributes like (oninit)=${}
+        let isForceElement = options.forceElement;
+        tagComponents.forEach(tagComponent => {
+            subscribeToTemplate(tagComponent.insertBefore, tagComponent.subject, tagComponent.ownerSupport, options.counts, { isForceElement });
+            afterInterpolateElement(elementContainer, tagComponent.insertBefore, tagComponent.ownerSupport, // this, // ownerTag
+            context, options);
+        });
+    }
+    getTemplate() {
+        const thisTag = this.templater.tag;
+        const strings = this.strings || thisTag.strings;
+        const values = this.values || thisTag.values;
+        const string = strings.map((string, index) => {
+            const safeString = string.replace(prefixSearch, escapeVariable);
+            const endString = safeString + (values.length > index ? `{${variablePrefix}${index}}` : '');
+            // const trimString = index === 0 || index === this.strings.length-1 ? endString.trim() : endString
+            const trimString = endString.replace(/>\s*/g, '>').replace(/\s*</g, '<');
+            return trimString;
+        }).join('');
+        const interpolation = interpolateString(string);
+        this.lastTemplateString = interpolation.string;
+        return {
+            interpolation,
+            // string,
+            string: interpolation.string,
+            strings,
+            values,
+            context: this.global.context || {},
+        };
+    }
+    /** Used during HMR only where static content itself could have been edited */
+    rebuild() {
+        // const insertBefore = this.insertBefore
+        const insertBefore = this.global.insertBefore;
+        if (!insertBefore) {
+            const err = new Error('Cannot rebuild. Previous insertBefore element is not defined on tag');
+            err.tag = this;
+            throw err;
+        }
+        this.buildBeforeElement(insertBefore, {
+            forceElement: true,
+            counts: { added: 0, removed: 0 },
+        });
+    }
+    getAppElement() {
+        let tag = this;
+        while (tag.ownerTagSupport) {
+            tag = tag.ownerTagSupport;
+        }
+        return tag;
     }
 }
 //# sourceMappingURL=TagSupport.class.js.map

package/js/TagSupport.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"TagSupport.class.js","sourceRoot":"","sources":["../ts/TagSupport.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAMxE,MAAM,OAAO,cAAc;IAmBhB;IACA;IAnBT,KAAK,GAAG,IAAI,CAAA;IAEZ,WAAW,CAMV;IAED,MAAM,GAAc;QAClB,mHAAmH;QACnH,KAAK,EAAE;YACL,MAAM,EAAE,EAAsB;SAC/B;KACF,CAAA;IAED,YACS,SAA0B,EAC1B,OAAmB;QADnB,cAAS,GAAT,SAAS,CAAiB;QAC1B,YAAO,GAAP,OAAO,CAAY;QAE1B,MAAM,QAAQ,GAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAA,CAAC,uCAAuC;QAC7F,MAAM,KAAK,GAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA,CAAE,gBAAgB;QAE3D,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA,CAAC,+BAA+B;QACrE,IAAI,CAAC,WAAW,GAAG;YACjB,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,2CAA2C;YACzD,WAAW,EAAE,YAAY,EAAE,kBAAkB;YAC7C,mBAAmB,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC5C,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAC/C,OAAO,WAAW,CAAA;YACpB,CAAC,CAAC;SACH,CAAA;QAED,qGAAqG;QACrG,IAAG,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,WAAW,CAAC,YAAY,GAAG,SAAS,CAAE,YAAY,CAAE,CAAA;YACzD,IAAI,CAAC,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAA;QAC9D,CAAC;IACH,CAAC;CACF;AAGD,SAAS,eAAe,CAAI,MAA2B;IACrD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,KAAY,CAAA;QAExB,IAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACpC,CAAC;QAED,IAAG,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,GAAiC,CAAA;YACtD,OAAO,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACtC,CAAC;QAED,IAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,OAAO,eAAe,CAAC,GAAuB,CAAC,CAAA;QACjD,CAAC;QAED,OAAO,SAAS,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,OAAO,UAAW,SAAQ,cAAc;IAInC;IACA;IACA;IALT,KAAK,GAAG,KAAK,CAAA;IAEb,YACS,eAA2B,EAC3B,SAA0B,EAC1B,OAAmB;QAE1B,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAJlB,oBAAe,GAAf,eAAe,CAAY;QAC3B,cAAS,GAAT,SAAS,CAAiB;QAC1B,YAAO,GAAP,OAAO,CAAY;IAG5B,CAAC;CACF"}
+{"version":3,"file":"TagSupport.class.js","sourceRoot":"","sources":["../ts/TagSupport.class.ts"],"names":[],"mappings":"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"}

package/js/TemplaterResult.class.d.ts

@@ -1,20 +1,19 @@
 import { Context, Tag } from './Tag.class';
-import { BaseTagSupport } from './TagSupport.class';
+import { BaseTagSupport, TagSupport } from './TagSupport.class';
 import { Props } from './Props';
 import { TagChildren } from './tag';
-import { Provider } from './providers';
-import { OnDestroyCallback } from './onDestroy';
-import { TagSubject } from './Tag.utils';
-import { OnInitCallback } from './onInit';
+import { Provider } from './state/providers';
+import { OnDestroyCallback } from './state/onDestroy';
+import { TagSubject } from './subject.types';
+import { OnInitCallback } from './state/onInit';
 import { Subscription } from './subject/Subject.utils';
 import { InsertBefore } from './Clones.type';
-export type Wrapper = ((tagSupport: BaseTagSupport, subject: TagSubject) => Tag) & {
+export type Wrapper = ((tagSupport: BaseTagSupport, subject: TagSubject) => TagSupport) & {
     original: () => Tag;
 };
 export type TagGlobal = {
-    newestTemplater: TemplaterResult;
-    oldest?: Tag;
-    newest?: Tag;
+    oldest?: TagSupport;
+    newest?: TagSupport;
     context: Context;
     providers: Provider[];
     /** Indicator of re-rending. Saves from double rending something already rendered */
@@ -23,19 +22,20 @@ export type TagGlobal = {
     isApp?: boolean;
     insertBefore?: InsertBefore;
     placeholder?: Text;
-    subscriptions: Subscription[];
+    subscriptions: Subscription<any>[];
     destroyCallback?: OnDestroyCallback;
     init?: OnInitCallback;
 };
 export declare class TemplaterResult {
     props: Props;
     children: TagChildren;
-    isTag: boolean;
+    isTemplater: boolean;
     tagged: boolean;
-    wrapper: Wrapper;
-    global: TagGlobal;
-    tagSupport: BaseTagSupport;
+    wrapper?: Wrapper;
+    tag?: Tag;
     constructor(props: Props, children: TagChildren);
-    isTemplater: boolean;
 }
-export declare function renderWithSupport(tagSupport: BaseTagSupport, existingTag: Tag | undefined, subject: TagSubject, ownerTag?: Tag): Tag;
+export declare function renderWithSupport(tagSupport: BaseTagSupport, // new
+lastSupport: TagSupport | undefined, // previous
+subject: TagSubject, // events & memory
+ownerSupport?: TagSupport): TagSupport;

package/js/TemplaterResult.class.js

@@ -1,80 +1,69 @@
 import { runAfterRender, runBeforeRedraw, runBeforeRender } from './tagRunner';
-import { setUse } from './setUse.function';
+import { setUse } from './state';
 import { isLikeTags } from './isLikeTags.function';
 import { destroyTagMemory } from './destroyTag.function';
 export class TemplaterResult {
     props;
     children;
-    isTag = false; // when true, is basic tag non-component
+    isTemplater = true;
     tagged;
     wrapper;
-    global = {
-        newestTemplater: this,
-        context: {}, // populated after reading interpolated.values array converted to an object {variable0, variable:1}
-        providers: [],
-        /** Indicator of re-rending. Saves from double rending something already rendered */
-        renderCount: 0,
-        deleted: false,
-        subscriptions: []
-    };
-    tagSupport;
+    tag;
     constructor(props, children) {
         this.props = props;
         this.children = children;
     }
-    /*
-    redraw?: (
-      force?: boolean, // force children to redraw
-    ) => Tag
-    */
-    isTemplater = true;
 }
-export function renderWithSupport(tagSupport, existingTag, subject, ownerTag) {
-    const wrapTagSupport = tagSupport; // this.tagSupport
+export function renderWithSupport(tagSupport, // new
+lastSupport, // previous
+subject, // events & memory
+ownerSupport) {
     /* BEFORE RENDER */
-    const runtimeOwnerTag = existingTag?.ownerTag || ownerTag;
-    if (existingTag) {
-        wrapTagSupport.memory.state.newest = [...existingTag.tagSupport.memory.state.newest];
-        wrapTagSupport.templater.global = existingTag.tagSupport.templater.global;
-        runBeforeRedraw(wrapTagSupport, existingTag);
+    const lastOwnerSupport = lastSupport?.ownerTagSupport;
+    const runtimeOwnerSupport = lastOwnerSupport || ownerSupport;
+    if (lastSupport) {
+        const lastState = lastSupport.memory.state;
+        const memory = tagSupport.memory;
+        memory.state = [...lastState];
+        tagSupport.global = lastSupport.global;
+        runBeforeRedraw(tagSupport, lastSupport);
     }
     else {
-        if (!wrapTagSupport) {
-            throw new Error('63521');
-        }
         // first time render
-        runBeforeRender(wrapTagSupport, runtimeOwnerTag);
+        runBeforeRender(tagSupport, runtimeOwnerSupport);
         // TODO: Logic below most likely could live within providers.ts inside the runBeforeRender function
         const providers = setUse.memory.providerConfig;
-        providers.ownerTag = runtimeOwnerTag;
+        providers.ownerSupport = runtimeOwnerSupport;
     }
     /* END: BEFORE RENDER */
-    const templater = wrapTagSupport.templater;
+    const templater = tagSupport.templater;
+    const subTag = subject.tagSupport;
     // NEW TAG CREATED HERE
-    const retag = templater.wrapper(wrapTagSupport, subject);
+    const wrapper = templater.wrapper;
+    const reSupport = wrapper(tagSupport, subject);
     /* AFTER */
-    runAfterRender(wrapTagSupport, retag);
-    const isLikeTag = !existingTag || isLikeTags(existingTag, retag);
+    runAfterRender(tagSupport, reSupport);
+    const isLikeTag = !lastSupport || isLikeTags(lastSupport, reSupport);
     if (!isLikeTag) {
-        destroyUnlikeTags(existingTag, templater, subject);
+        destroyUnlikeTags(lastSupport, reSupport, subject);
     }
-    retag.ownerTag = runtimeOwnerTag;
-    wrapTagSupport.templater.global.newest = retag;
-    return retag;
+    reSupport.ownerTagSupport = (ownerSupport || lastOwnerSupport);
+    tagSupport.global.newest = reSupport;
+    return reSupport;
 }
-function destroyUnlikeTags(existingTag, // old
-templater, // new
+function destroyUnlikeTags(lastSupport, // old
+reSupport, // new
 subject) {
-    const oldGlobal = existingTag.tagSupport.templater.global;
+    const oldGlobal = lastSupport.global;
     const insertBefore = oldGlobal.insertBefore;
-    destroyTagMemory(existingTag, subject);
-    // ??? - new so that when a tag is destroy the unlike does not carry the destroy signifier
-    templater.global = { ...templater.global }; // break memory references
-    const global = templater.global;
+    destroyTagMemory(lastSupport, subject);
+    // when a tag is destroyed, disconnect the globals
+    reSupport.global = { ...oldGlobal }; // break memory references
+    const global = reSupport.global;
     global.insertBefore = insertBefore;
     global.deleted = false;
     delete global.oldest;
     delete global.newest;
-    delete subject.tag;
+    delete subject.tagSupport;
 }
 //# sourceMappingURL=TemplaterResult.class.js.map

package/js/TemplaterResult.class.js.map

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

package/js/afterInterpolateElement.function.d.ts

@@ -0,0 +1,4 @@
+import { InsertBefore } from './Clones.type';
+import { Context, ElementBuildOptions } from './Tag.class';
+import { TagSupport } from './TagSupport.class';
+export declare function afterInterpolateElement(container: Element, insertBefore: InsertBefore, tagSupport: TagSupport, context: Context, options: ElementBuildOptions): ChildNode[];

package/js/afterInterpolateElement.function.js

@@ -0,0 +1,14 @@
+import { buildClones } from './render';
+import { afterElmBuild } from './interpolations/interpolateTemplate';
+export function afterInterpolateElement(container, insertBefore, tagSupport, 
+// preClones: Clones,
+context, options) {
+    const clones = buildClones(container, insertBefore);
+    if (!clones.length) {
+        return clones;
+    }
+    clones.forEach(clone => afterElmBuild(clone, options, context, tagSupport));
+    tagSupport.clones.push(...clones);
+    return clones;
+}
+//# sourceMappingURL=afterInterpolateElement.function.js.map

package/js/afterInterpolateElement.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"afterInterpolateElement.function.js","sourceRoot":"","sources":["../ts/afterInterpolateElement.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAKpE,MAAM,UAAU,uBAAuB,CACrC,SAAkB,EAClB,YAA0B,EAC1B,UAAsB;AACtB,qBAAqB;AACrB,OAAgB,EAChB,OAA4B;IAE5B,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IACnD,IAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;IAC3E,UAAU,CAAC,MAAM,CAAC,IAAI,CAAE,GAAG,MAAM,CAAE,CAAA;IAEnC,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/alterProps.function.d.ts

@@ -1,6 +1,4 @@
 import { Props } from './Props';
 import { TagSupport } from './TagSupport.class';
-import { TemplaterResult } from './TemplaterResult.class';
-export declare function alterProps(props: Props, templater: TemplaterResult, ownerSupport: TagSupport): any;
-export declare function callbackPropOwner(toCall: (...args: any[]) => any, callWith: any, templater: TemplaterResult, // only used to prevent rendering double
-ownerSupport: TagSupport): any;
+export declare function alterProps(props: Props, ownerSupport: TagSupport): any;
+export declare function callbackPropOwner(toCall: (...args: any[]) => any, callWith: any, ownerSupport: TagSupport): any;

package/js/alterProps.function.js

@@ -1,11 +1,11 @@
-import { isTagInstance } from './isInstance';
+import { isTag } from './isInstance';
 import { renderTagSupport } from './renderTagSupport.function';
 /* Used to rewrite props that are functions. When they are called it should cause parent rendering */
-export function alterProps(props, templater, ownerSupport) {
+export function alterProps(props, ownerSupport) {
     function callback(toCall, callWith) {
-        return callbackPropOwner(toCall, callWith, templater, ownerSupport);
+        return callbackPropOwner(toCall, callWith, ownerSupport);
     }
-    const isPropTag = isTagInstance(props);
+    const isPropTag = isTag(props);
     const watchProps = isPropTag ? 0 : props;
     const newProps = resetFunctionProps(watchProps, callback);
     return newProps;
@@ -34,18 +34,10 @@ function resetFunctionProps(props, callback) {
     });
     return newProps;
 }
-export function callbackPropOwner(toCall, callWith, templater, // only used to prevent rendering double
-ownerSupport) {
-    const renderCount = templater.global.renderCount;
+export function callbackPropOwner(toCall, callWith, ownerSupport) {
     const callbackResult = toCall(...callWith);
-    if (templater.global.renderCount > renderCount) {
-        throw new Error('already rendered');
-    }
-    const lastestOwner = ownerSupport.templater.global.newest;
-    const newOwner = renderTagSupport(lastestOwner.tagSupport, true);
-    if (newOwner.tagSupport.templater.global.newest != newOwner) {
-        throw new Error('newest assignment issue?');
-    }
+    const lastestOwner = ownerSupport.global.newest;
+    renderTagSupport(lastestOwner, true);
     return callbackResult;
 }
 //# sourceMappingURL=alterProps.function.js.map

package/js/alterProps.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"alterProps.function.js","sourceRoot":"","sources":["../ts/alterProps.function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE9D,qGAAqG;AACrG,MAAM,UAAU,UAAU,CACxB,KAAY,EACZ,SAA0B,EAC1B,YAAwB;IAExB,SAAS,QAAQ,CAAC,MAAW,EAAE,QAAa;QAC1C,OAAO,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAA;IACrE,CAAC;IAED,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IACtC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IACxC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAEzD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAU,EACV,QAAiD;IAEjD,IAAG,OAAM,CAAC,KAAK,CAAC,KAAG,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAA;IACtB,uFAAuF;IACvF,+BAA+B;IAE/B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,IAAG,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;YAExC,IAAG,QAAQ,EAAE,CAAC;gBACZ,OAAM,CAAC,+BAA+B;YACxC,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;gBAClC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC,wDAAwD;YAChG,CAAC,CAAA;YAED,kGAAkG;YAClG,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACjE,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAA;YAE/B,OAAM;QACR,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,MAA+B,EAC/B,QAAa,EACb,SAA0B,EAAE,wCAAwC;AACpE,YAAwB;IAExB,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,WAAW,CAAA;IAChD,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAA;IAE1C,IAAG,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACrC,CAAC;IAED,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,MAAa,CAAA;IAChE,MAAM,QAAQ,GAAG,gBAAgB,CAC/B,YAAY,CAAC,UAAU,EACvB,IAAI,CACL,CAAA;IAED,IAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC7C,CAAC;IAED,OAAO,cAAc,CAAA;AACvB,CAAC"}
+{"version":3,"file":"alterProps.function.js","sourceRoot":"","sources":["../ts/alterProps.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE9D,qGAAqG;AACrG,MAAM,UAAU,UAAU,CACxB,KAAY,EACZ,YAAwB;IAExB,SAAS,QAAQ,CACf,MAA+B,EAC/B,QAAmB;QAEnB,OAAO,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9B,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IACxC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAEzD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAU,EACV,QAAiD;IAEjD,IAAG,OAAM,CAAC,KAAK,CAAC,KAAG,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAA;IACtB,uFAAuF;IACvF,+BAA+B;IAE/B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACjD,IAAG,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;YAExC,IAAG,QAAQ,EAAE,CAAC;gBACZ,OAAM,CAAC,+BAA+B;YACxC,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;gBAClC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA,CAAC,wDAAwD;YAChG,CAAC,CAAA;YAED,kGAAkG;YAClG,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACjE,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAA;YAE/B,OAAM;QACR,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,MAA+B,EAC/B,QAAa,EACb,YAAwB;IAExB,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAA;IAC1C,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,MAAoB,CAAA;IAE7D,gBAAgB,CACd,YAAY,EACZ,IAAI,CACL,CAAA;IAED,OAAO,cAAc,CAAA;AACvB,CAAC"}

package/js/bindSubjectCallback.function.js

@@ -5,9 +5,6 @@ export function bindSubjectCallback(value, tag) {
     if (value.isChildOverride) {
         return value;
     }
-    if (!tag.ownerTag && !tag.tagSupport.templater.global.isApp) {
-        throw new Error('no ownerTag issue here');
-    }
     const subjectFunction = (element, args) => runTagCallback(value, tag, element, args);
     // link back to original. Mostly used for <div oninit ondestroy> animations
     subjectFunction.tagFunction = value;