taggedjs 2.4.2 → 2.4.10

package/js/tag.js

@@ -1,13 +1,14 @@
-import { isSubjectInstance, isTagArray, isTagInstance } from "./isInstance.js";
-import { setUse } from "./setUse.function.js";
-import { TemplaterResult, alterProps } from "./templater.utils.js";
-import { ValueSubject } from "./ValueSubject.js";
-import { runTagCallback } from "./bindSubjectCallback.function.js";
-import { deepClone } from "./deepFunctions.js";
-import { TagSupport } from "./TagSupport.class.js";
+import { isSubjectInstance, isTagArray, isTagInstance } from './isInstance';
+import { setUse } from './setUse.function';
+import { TemplaterResult } from './TemplaterResult.class';
+import { ValueSubject } from './ValueSubject';
+import { runTagCallback } from './bindSubjectCallback.function';
+import { deepClone } from './deepFunctions';
+import { TagSupport } from './TagSupport.class';
+import { alterProps } from './alterProps.function';
 export const tags = [];
 let tagCount = 0;
-/** Wraps a tag component in a state manager and always push children to last argument as any array */
+/** Wraps a tag component in a state manager and always push children to last argument as an array */
 // export function tag<T>(a: T): T;
 export function tag(tagComponent) {
     const result = (function tagWrapper(props, children) {
@@ -19,65 +20,7 @@ export function tag(tagComponent) {
         const { childSubject, madeSubject } = kidsToTagArraySubject(children);
         childSubject.isChildSubject = true;
         const templater = new TemplaterResult(props, childSubject);
-        function innerTagWrap() {
-            const originalFunction = innerTagWrap.original;
-            const oldTagSetup = templater.tagSupport;
-            const oldest = templater.oldest;
-            let props = oldTagSetup.propsConfig.latest;
-            let castedProps = alterProps(props, templater);
-            // CALL ORIGINAL COMPONENT FUNCTION
-            const tag = originalFunction(castedProps, childSubject);
-            if (oldTagSetup.mutatingRender === TagSupport.prototype.mutatingRender) {
-                oldTagSetup.oldest = tag;
-                // tag.tagSupport = oldTagSetup
-                oldTagSetup.mutatingRender = () => {
-                    const exit = oldTagSetup.renderExistingTag(tag, templater);
-                    if (exit) {
-                        return tag;
-                    }
-                    if (tag.ownerTag) {
-                        const newest = tag.ownerTag.tagSupport.render();
-                        tag.ownerTag.tagSupport.newest = newest;
-                        return tag;
-                    }
-                    return tag;
-                };
-            }
-            tag.tagSupport = new TagSupport(templater, oldTagSetup.children);
-            const clonedProps = deepClone(castedProps); // castedProps
-            tag.tagSupport.propsConfig = {
-                latest: props, // castedProps
-                latestCloned: clonedProps,
-                clonedProps: clonedProps,
-                lastClonedKidValues: tag.tagSupport.propsConfig.lastClonedKidValues,
-            };
-            tag.tagSupport.memory = oldTagSetup.memory;
-            tag.tagSupport.mutatingRender = oldTagSetup.mutatingRender;
-            oldTagSetup.newest = tag;
-            oldTagSetup.propsConfig = { ...tag.tagSupport.propsConfig };
-            if (oldest) {
-                oldest.tagSupport.propsConfig = { ...tag.tagSupport.propsConfig };
-            }
-            if (madeSubject) {
-                childSubject.value.forEach(kid => {
-                    kid.values.forEach((value, index) => {
-                        if (!(value instanceof Function)) {
-                            return;
-                        }
-                        if (kid.values[index].isChildOverride) {
-                            return; // already overwritten
-                        }
-                        // all functions need to report to me
-                        kid.values[index] = function (...args) {
-                            runTagCallback(value, tag.ownerTag, this, args);
-                            // runTagCallback(value, tag, this, args)
-                        };
-                        kid.values[index].isChildOverride = true;
-                    });
-                });
-            }
-            return tag;
-        }
+        const innerTagWrap = getTagWrap(templater, madeSubject);
         innerTagWrap.original = tagComponent;
         templater.tagged = true;
         templater.wrapper = innerTagWrap;
@@ -102,7 +45,10 @@ function kidsToTagArraySubject(children) {
         kid.arrayValue = 0;
         return { childSubject: new ValueSubject([kid]), madeSubject: true };
     }
-    return { childSubject: new ValueSubject([]), madeSubject: true };
+    return {
+        childSubject: new ValueSubject([]),
+        madeSubject: true
+    };
 }
 function updateResult(result, tagComponent) {
     result.isTag = true;
@@ -111,9 +57,72 @@ function updateResult(result, tagComponent) {
 function updateComponent(tagComponent) {
     tagComponent.tags = tags;
     tagComponent.setUse = setUse;
-    tagComponent.tagIndex = ++tagCount; // needed for things like HMR
+    tagComponent.tagIndex = tagCount++; // needed for things like HMR
 }
-class NoPropsGiven {
+/** creates/returns a function that when called then calls the original component function */
+function getTagWrap(templater, madeSubject) {
+    const innerTagWrap = function (oldTagSetup, subject) {
+        const global = oldTagSetup.templater.global;
+        global.newestTemplater = templater;
+        ++global.renderCount;
+        templater.global = global;
+        const childSubject = templater.children;
+        const lastArray = global.oldest?.tagSupport.templater.children.lastArray;
+        if (lastArray) {
+            childSubject.lastArray = lastArray;
+        }
+        const originalFunction = innerTagWrap.original;
+        // const oldTagSetup = templater.tagSupport
+        const oldest = templater.global.oldest;
+        if (oldest && !oldest.hasLiveElements) {
+            throw new Error('issue already 22');
+        }
+        // ???
+        let props = templater.props;
+        // let props = oldTagSetup.propsConfig.latest
+        const ownerTagSupport = oldTagSetup.ownerTagSupport;
+        const oldTemplater = ownerTagSupport?.templater;
+        const oldLatest = oldTemplater?.global.newest;
+        const newestOwnerTemplater = oldLatest?.tagSupport.templater;
+        if (oldLatest && !newestOwnerTemplater) {
+            throw new Error('what to do here?');
+        }
+        // ???
+        let castedProps = alterProps(props, newestOwnerTemplater, oldTagSetup.ownerTagSupport);
+        const clonedProps = deepClone(props); // castedProps
+        // CALL ORIGINAL COMPONENT FUNCTION
+        const tag = originalFunction(castedProps, childSubject);
+        tag.tagSupport = new TagSupport(oldTagSetup.ownerTagSupport, templater, subject);
+        tag.tagSupport.propsConfig = {
+            latest: props, // castedProps
+            latestCloned: clonedProps,
+            clonedProps: clonedProps,
+            lastClonedKidValues: tag.tagSupport.propsConfig.lastClonedKidValues,
+        };
+        tag.tagSupport.memory = oldTagSetup.memory; // state handover
+        if (madeSubject) {
+            childSubject.value.forEach(kid => {
+                kid.values.forEach((value, index) => {
+                    if (!(value instanceof Function)) {
+                        return;
+                    }
+                    const valuesValue = kid.values[index];
+                    if (valuesValue.isChildOverride) {
+                        return; // already overwritten
+                    }
+                    // all functions need to report to me
+                    kid.values[index] = function (...args) {
+                        const ownerTag = tag.ownerTag;
+                        runTagCallback(value, // callback
+                        ownerTag, this, // bindTo
+                        args);
+                    };
+                    valuesValue.isChildOverride = true;
+                });
+            });
+        }
+        return tag;
+    };
+    return innerTagWrap;
 }
-const noPropsGiven = new NoPropsGiven();
 //# sourceMappingURL=tag.js.map

package/js/tag.js.map

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

package/js/tagElement.d.ts

@@ -1,7 +1,7 @@
-import { TagSupport } from "./TagSupport.class.js";
-import { TemplaterResult } from "./templater.utils.js";
-import { Tag } from "./Tag.class.js";
-import { TagComponent } from "./tag.js";
+import { BaseTagSupport } from './TagSupport.class';
+import { TemplaterResult } from './TemplaterResult.class';
+import { Tag } from './Tag.class';
+import { TagComponent } from './tag';
 export declare function tagElement(app: TagComponent, // (...args: unknown[]) => TemplaterResult,
 element: HTMLElement | Element, props: unknown): {
     tag: Tag;
@@ -9,7 +9,5 @@ element: HTMLElement | Element, props: unknown): {
 };
 export declare function applyTagUpdater(wrapper: TemplaterResult): {
     tag: Tag;
-    tagSupport: TagSupport;
+    tagSupport: BaseTagSupport;
 };
-/** Overwrites arguments.tagSupport.mutatingRender */
-export declare function addAppTagRender(tagSupport: TagSupport, tag: Tag): void;

package/js/tagElement.js

@@ -1,5 +1,6 @@
-import { runAfterRender, runBeforeRedraw, runBeforeRender } from "./tagRunner.js";
-import { providersChangeCheck } from "./provider.utils.js";
+import { BaseTagSupport } from './TagSupport.class';
+import { runAfterRender, runBeforeRender } from './tagRunner';
+import { ValueSubject } from './ValueSubject';
 const appElements = [];
 export function tagElement(app, // (...args: unknown[]) => TemplaterResult,
 element, props) {
@@ -14,47 +15,35 @@ element, props) {
     const wrapper = app(props);
     // have a function setup and call the tagWrapper with (props, {update, async, on})
     const result = applyTagUpdater(wrapper);
-    const { tag, tagSupport } = result;
-    // wrapper.tagSupport = tagSupport
+    const { tag } = result;
+    // TODO: is the below needed?
     tag.appElement = element;
-    tag.tagSupport.oldest = tag;
-    addAppTagRender(tag.tagSupport, tag);
+    tag.tagSupport.templater.global.isApp = true;
     const templateElm = document.createElement('template');
-    templateElm.setAttribute('tag-detail', 'app-template-placeholder');
+    templateElm.setAttribute('id', 'app-tag-' + appElements.length);
+    templateElm.setAttribute('app-tag-detail', appElements.length.toString());
     element.appendChild(templateElm);
     tag.buildBeforeElement(templateElm);
+    wrapper.global.oldest = tag;
+    wrapper.global.newest = tag;
+    if (!tag.hasLiveElements) {
+        throw new Error('x');
+    }
+    ;
     element.setUse = app.original.setUse;
     appElements.push({ element, tag });
     return { tag, tags: app.original.tags };
 }
 export function applyTagUpdater(wrapper) {
-    const tagSupport = wrapper.tagSupport;
+    const subject = new ValueSubject({});
+    const tagSupport = new BaseTagSupport(wrapper, subject);
+    wrapper.tagSupport = tagSupport;
     runBeforeRender(tagSupport, undefined);
     // Call the apps function for our tag templater
-    const tag = wrapper.wrapper();
+    const tag = wrapper.wrapper(tagSupport, subject);
+    // wrapper.global.oldest = tag
+    // wrapper.global.newest = tag
     runAfterRender(tagSupport, tag);
     return { tag, tagSupport };
 }
-/** Overwrites arguments.tagSupport.mutatingRender */
-export function addAppTagRender(tagSupport, tag) {
-    let lastTag = tag;
-    tagSupport.mutatingRender = () => {
-        const preRenderCount = tagSupport.memory.renderCount;
-        providersChangeCheck(tag);
-        // When the providers were checked, a render to myself occurred and I do not need to re-render again
-        if (preRenderCount !== tagSupport.memory.renderCount) {
-            return lastTag;
-        }
-        runBeforeRedraw(tag.tagSupport, tag);
-        const templater = tagSupport.templater; // wrapper
-        const fromTag = lastTag = templater.wrapper();
-        fromTag.tagSupport.memory = tagSupport.memory;
-        tagSupport.propsConfig = { ...fromTag.tagSupport.propsConfig };
-        tag.tagSupport.newest = fromTag;
-        runAfterRender(tag.tagSupport, tag);
-        tagSupport.oldest.updateByTag(fromTag);
-        tagSupport.newest = fromTag;
-        return lastTag;
-    };
-}
 //# sourceMappingURL=tagElement.js.map

package/js/tagElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"tagElement.js","sourceRoot":"","sources":["../ts/tagElement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tagElement.js","sourceRoot":"","sources":["../ts/tagElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAI7D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,WAAW,GAAmC,EAAE,CAAA;AAEtD,MAAM,UAAU,UAAU,CACxB,GAAiB,EAAE,2CAA2C;AAC9D,OAA8B,EAC9B,KAAc;IAEd,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;IAC/E,IAAG,WAAW,IAAI,CAAC,EAAE,CAAC;QACpB,WAAW,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;QACtC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;QAClC,sCAAsC;QACtC,OAAO,CAAC,IAAI,CAAC,6DAA6D,EAAE,EAAC,OAAO,EAAC,CAAC,CAAA;IACxF,CAAC;IAED,2DAA2D;IAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAA+B,CAAA;IAExD,kFAAkF;IAClF,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACvC,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,CAAA;IAEpB,6BAA6B;IAC7B,GAAG,CAAC,UAAU,GAAG,OAAO,CAAA;IACxB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAA;IAE5C,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IACtD,WAAW,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IAC/D,WAAW,CAAC,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;IACzE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;IAEhC,GAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;IAEnC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;IAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;IAE3B,IAAG,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IAED,CAAC;IAAC,OAAe,CAAC,MAAM,GAAI,GAAW,CAAC,QAAQ,CAAC,MAAM,CAAA;IAEvD,WAAW,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,CAAC,CAAA;IAEhC,OAAO,EAAC,GAAG,EAAE,IAAI,EAAG,GAAW,CAAC,QAAQ,CAAC,IAAI,EAAC,CAAA;AAChD,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,OAAwB;IAExB,MAAM,OAAO,GAAG,IAAI,YAAY,CAAM,EAAS,CAA0B,CAAA;IACzE,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACvD,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAC/B,eAAe,CAAC,UAAU,EAAE,SAAuB,CAAC,CAAA;IAEpD,+CAA+C;IAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CACzB,UAAU,EACV,OAAO,CACR,CAAA;IACD,8BAA8B;IAC9B,8BAA8B;IAC9B,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAE/B,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC"}

package/js/tagRunner.d.ts

@@ -1,6 +1,6 @@
-import { Tag } from "./Tag.class.js";
-import { TagSupport } from "./TagSupport.class.js";
-export declare function runBeforeRender(tagSupport: TagSupport, tagOwner: Tag): void;
-export declare function runAfterRender(tagSupport: TagSupport, tag: Tag): void;
-export declare function runBeforeRedraw(tagSupport: TagSupport, tag: Tag): void;
-export declare function runBeforeDestroy(tagSupport: TagSupport, tag: Tag): void;
+import { Tag } from './Tag.class';
+import { BaseTagSupport } from './TagSupport.class';
+export declare function runBeforeRender(tagSupport: BaseTagSupport, tagOwner: Tag): void;
+export declare function runAfterRender(tagSupport: BaseTagSupport, tag: Tag): void;
+export declare function runBeforeRedraw(tagSupport: BaseTagSupport, tag: Tag): void;
+export declare function runBeforeDestroy(tagSupport: BaseTagSupport, tag: Tag): void;

package/js/tagRunner.js

@@ -1,5 +1,5 @@
 // TODO: This should be more like `new TaggedJs().use({})`
-import { setUse } from "./setUse.function.js";
+import { setUse } from './setUse.function';
 // Life cycle 1
 export function runBeforeRender(tagSupport, tagOwner) {
     setUse.tagUse.forEach(tagUse => tagUse.beforeRender(tagSupport, tagOwner));

package/js/tagRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"tagRunner.js","sourceRoot":"","sources":["../ts/tagRunner.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAI1D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,eAAe;AACf,MAAM,UAAU,eAAe,CAC7B,UAAsB,EACtB,QAAa;IAEb,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;AAC5E,CAAC;AAED,eAAe;AACf,MAAM,UAAU,cAAc,CAC5B,UAAsB,EACtB,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACtE,CAAC;AAED,eAAe;AACf,MAAM,UAAU,eAAe,CAC7B,UAAsB,EACtB,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACvE,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,gBAAgB,CAC9B,UAAsB,EACtB,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACxE,CAAC"}
+{"version":3,"file":"tagRunner.js","sourceRoot":"","sources":["../ts/tagRunner.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAI1D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,eAAe;AACf,MAAM,UAAU,eAAe,CAC7B,UAA0B,EAC1B,QAAa;IAEb,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;AAC5E,CAAC;AAED,eAAe;AACf,MAAM,UAAU,cAAc,CAC5B,UAA0B,EAC1B,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACtE,CAAC;AAED,eAAe;AACf,MAAM,UAAU,eAAe,CAC7B,UAA0B,EAC1B,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACvE,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,gBAAgB,CAC9B,UAA0B,EAC1B,GAAQ;IAER,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAA;AACxE,CAAC"}

package/js/templater.utils.d.ts

@@ -1,26 +1,37 @@
-import { Tag } from "./Tag.class.js";
-import { TagSupport } from "./TagSupport.class.js";
-import { Props } from "./Props.js";
-import { TagChildren } from "./tag.js";
-export type Wrapper = (() => Tag) & {
+import { Context, Tag } from './Tag.class';
+import { BaseTagSupport } from './TagSupport.class';
+import { Props } from './Props';
+import { TagChildren } from './tag';
+import { Provider } from './providers';
+import { OnDestroyCallback } from './onDestroy';
+export type Wrapper = ((tagSupport: BaseTagSupport) => Tag) & {
     original: () => Tag;
 };
 export declare class TemplaterResult {
+    props: Props;
+    children: TagChildren;
     tagged: boolean;
     wrapper: Wrapper;
-    newest?: Tag;
-    oldest?: Tag;
-    tagSupport: TagSupport;
+    global: {
+        oldest?: Tag;
+        newest?: Tag;
+        context: Context;
+        providers: Provider[];
+        /** Indicator of re-rending. Saves from double rending something already rendered */
+        renderCount: number;
+        destroyCallback?: OnDestroyCallback;
+        insertBefore?: Element | Text;
+    };
+    tagSupport: BaseTagSupport;
     constructor(props: Props, children: TagChildren);
-    redraw?: (force?: boolean) => Tag | undefined;
+    redraw?: (force?: boolean) => Tag;
     isTemplater: boolean;
-    forceRenderTemplate(tagSupport: TagSupport, ownerTag: Tag): Tag;
-    renderWithSupport(tagSupport: TagSupport, existingTag: Tag | undefined, ownerTag?: Tag): {
+    renderWithSupport(tagSupport: BaseTagSupport, existingTag: Tag | undefined, ownerTag?: Tag): {
         remit: boolean;
         retag: Tag;
     };
 }
 export interface TemplateRedraw extends TemplaterResult {
-    redraw: () => Tag | undefined;
+    redraw: () => Tag;
 }
 export declare function alterProps(props: Props, templater: TemplaterResult): any;

package/js/templater.utils.js

@@ -1,72 +1,91 @@
-import { TagSupport } from "./TagSupport.class.js";
-import { isTagInstance } from "./isInstance.js";
-import { runAfterRender, runBeforeRedraw, runBeforeRender } from "./tagRunner.js";
-import { setUse } from "./setUse.function.js";
+import { isTagInstance } from './isInstance';
+import { runAfterRender, runBeforeRedraw, runBeforeRender } from './tagRunner';
+import { setUse } from './setUse.function';
 export class TemplaterResult {
+    props;
+    children;
     tagged;
     wrapper;
-    newest;
-    oldest;
+    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,
+    };
     tagSupport;
     constructor(props, children) {
-        this.tagSupport = new TagSupport(this, children, props);
+        this.props = props;
+        this.children = children;
     }
     redraw;
     isTemplater = true;
-    forceRenderTemplate(tagSupport, ownerTag) {
-        const tag = this.wrapper();
-        runAfterRender(tagSupport, tag);
-        this.oldest = tag;
-        tagSupport.oldest = tag;
-        this.oldest = tag;
-        this.newest = tag;
-        tag.ownerTag = ownerTag;
-        return tag;
-    }
     renderWithSupport(tagSupport, existingTag, ownerTag) {
+        const wrapTagSupport = tagSupport; // this.tagSupport
+        // this.tagSupport = wrapTagSupport
         /* BEFORE RENDER */
         // signify to other operations that a rendering has occurred so they do not need to render again
-        ++tagSupport.memory.renderCount;
+        // ++wrapTagSupport.memory.renderCount
         const runtimeOwnerTag = existingTag?.ownerTag || ownerTag;
         if (existingTag) {
-            tagSupport.propsConfig = { ...existingTag.tagSupport.propsConfig };
-            runBeforeRedraw(tagSupport, existingTag);
+            runBeforeRedraw(wrapTagSupport, existingTag);
         }
         else {
+            if (!wrapTagSupport) {
+                throw new Error('63521');
+            }
             // first time render
-            runBeforeRender(tagSupport, runtimeOwnerTag);
+            runBeforeRender(wrapTagSupport, runtimeOwnerTag);
             // TODO: Logic below most likely could live within providers.ts inside the runBeforeRender function
             const providers = setUse.memory.providerConfig;
             providers.ownerTag = runtimeOwnerTag;
         }
         /* END: BEFORE RENDER */
-        const templater = this;
-        const retag = templater.wrapper();
+        const retag = this.wrapper(wrapTagSupport);
         /* AFTER */
-        runAfterRender(tagSupport, retag);
-        templater.newest = retag;
+        runAfterRender(wrapTagSupport, retag);
         retag.ownerTag = runtimeOwnerTag;
-        const oldest = tagSupport.oldest = tagSupport.oldest || retag;
-        tagSupport.newest = retag;
-        oldest.tagSupport.templater = templater;
-        oldest.tagSupport.memory = retag.tagSupport.memory;
-        const isSameTag = existingTag && existingTag.isLikeTag(retag);
-        // If previously was a tag and seems to be same tag, then just update current tag with new values
-        if (isSameTag) {
-            existingTag.updateByTag(retag);
-            return { remit: false, retag };
+        wrapTagSupport.templater.global.newest = retag;
+        if (this.global.oldest && !this.global.oldest.hasLiveElements) {
+            throw new Error('56513540');
         }
+        if (wrapTagSupport.templater.global.oldest && !wrapTagSupport.templater.global.oldest.hasLiveElements) {
+            throw new Error('5555 - 10');
+        }
+        // new maybe not needed
+        // this.oldest = this.oldest || retag
+        // wrapTagSupport.oldest = wrapTagSupport.oldest || retag
         return { remit: true, retag };
     }
 }
 /* Used to rewrite props that are functions. When they are called it should cause parent rendering */
 export function alterProps(props, templater) {
     function callback(toCall, callWith) {
+        const renderCount = templater.global.renderCount;
         const callbackResult = toCall(...callWith);
-        const tagSupport = templater.newest?.ownerTag?.tagSupport;
+        const tag = templater.global.newest;
+        let tagSupport = tag?.tagSupport.ownerTagSupport;
         if (tagSupport) {
-            tagSupport.render();
+            tagSupport = templater.global.newest?.tagSupport || templater.global.oldest?.tagSupport || tagSupport;
+        }
+        if (templater.global.renderCount > renderCount) {
+            throw new Error('already rendered');
+        }
+        const ownerTag = tag?.ownerTag;
+        if (ownerTag) {
+            const newestOwner = ownerTag.tagSupport.templater.global.newest;
+            newestOwner.tagSupport.render();
+            return;
+        }
+        console.log('alter prop reder', {
+            original: tagSupport.templater.wrapper.original,
+            ownerTag: tag?.ownerTag,
+        });
+        const newTag = tagSupport.render(); // call owner to render
+        if (!templater.global.oldest) {
+            throw new Error('lklk');
         }
+        templater.global.newest = newTag;
+        // templater.global.oldest = templater.global.oldest || newTag
         return callbackResult;
     }
     const isPropTag = isTagInstance(props);
@@ -85,10 +104,6 @@ function resetFunctionProps(props, callback) {
         if (value instanceof Function) {
             const original = newProps[name].original;
             if (original) {
-                newProps[name] = (...args) => {
-                    return callback(value, args);
-                };
-                newProps[name].original = original;
                 return; // already previously converted
             }
             newProps[name] = (...args) => {

package/js/templater.utils.js.map

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

package/js/updateExistingTag.function.d.ts

@@ -1,4 +1,4 @@
-import { Tag } from "./Tag.class.js";
-import { TagSubject } from "./Tag.utils.js";
-import { TemplaterResult } from "./templater.utils.js";
-export declare function updateExistingTag(templater: TemplaterResult, ogTag: Tag, existingSubject: TagSubject): never[];
+import { Tag } from './Tag.class';
+import { TagSubject } from './Tag.utils';
+import { TemplaterResult } from './templater.utils';
+export declare function updateExistingTag(templater: TemplaterResult, ogTag: Tag, existingSubject: TagSubject): never[] | undefined;

package/js/updateExistingTag.function.js

@@ -1,14 +1,23 @@
-import { runAfterRender, runBeforeRedraw } from "./tagRunner.js";
+import { runAfterRender, runBeforeRedraw } from './tagRunner';
 export function updateExistingTag(templater, ogTag, existingSubject) {
+    if (!templater.tagSupport) {
+        throw new Error('start clone tag support here');
+    }
+    console.log('redraw templater!!!!', { wrapp: templater.wrapper?.original });
+    templater.render();
+    return;
     const tagSupport = ogTag.tagSupport;
-    const oldest = tagSupport.oldest;
-    const newest = tagSupport.newest;
-    runBeforeRedraw(oldest.tagSupport, newest || oldest);
-    const retag = templater.wrapper();
-    templater.newest = retag;
-    tagSupport.newest = retag;
+    const oldest = templater.global.oldest;
+    const newest = templater.global.newest;
+    // runBeforeRedraw(oldest.tagSupport, newest || oldest)
+    runBeforeRedraw(oldest.tagSupport, oldest);
+    const wrapTagSupport = tagSupport; // newest.tagSupport || tagSupport
+    // const retag = templater.wrapper(wrapTagSupport)
+    const retag = templater.wrapper(wrapTagSupport);
+    templater.global.newest = retag;
     runAfterRender(oldest.tagSupport, oldest);
     ogTag.updateByTag(retag);
+    // oldest.updateByTag(retag)
     existingSubject.set(templater);
     return [];
 }

package/js/updateExistingTag.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateExistingTag.function.js","sourceRoot":"","sources":["../ts/updateExistingTag.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGhE,MAAM,UAAU,iBAAiB,CAC/B,SAA0B,EAC1B,KAAU,EACV,eAA2B;IAE3B,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;IACnC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAa,CAAA;IACvC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAa,CAAA;IAEvC,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,IAAI,MAAM,CAAC,CAAA;IAEpD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,EAAE,CAAA;IAEjC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAA;IACxB,UAAU,CAAC,MAAM,GAAG,KAAK,CAAA;IACzB,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IACzC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAExB,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,OAAO,EAAE,CAAA;AACX,CAAC"}
+{"version":3,"file":"updateExistingTag.function.js","sourceRoot":"","sources":["../ts/updateExistingTag.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAG7D,MAAM,UAAU,iBAAiB,CAC/B,SAA0B,EAC1B,KAAU,EACV,eAA2B;IAE3B,IAAG,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;IACjD,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAC,KAAK,EAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAC,CAAC,CAEvE;IAAC,SAAiB,CAAC,MAAM,EAAE,CAAA;IAC5B,OAAM;IAEN,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;IACnC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,MAAa,CAAA;IAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,MAAa,CAAA;IAE7C,uDAAuD;IACvD,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IAE1C,MAAM,cAAc,GAAG,UAAU,CAAA,CAAC,kCAAkC;IAEpE,kDAAkD;IAClD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAE/C,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAA;IAE/B,cAAc,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IACzC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACxB,4BAA4B;IAE5B,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,OAAO,EAAE,CAAA;AACX,CAAC"}