taggedjs 2.1.2 → 2.3.26

package/js/processSubjectValue.function.js

@@ -0,0 +1,129 @@
+import { processSubjectComponent } from "./processSubjectComponent.function.js";
+import { processTagResult } from "./processTagResult.function.js";
+import { isTagComponent, isTagInstance } from "./isInstance.js";
+import { processTagArray } from "./processTagArray.js";
+import { getTagSupport } from "./getTagSupport.js";
+import { updateBetweenTemplates } from "./interpolateTemplate.js";
+var ValueTypes;
+(function (ValueTypes) {
+    ValueTypes["tag"] = "tag";
+    ValueTypes["tagArray"] = "tag-array";
+    ValueTypes["tagComponent"] = "tag-component";
+    ValueTypes["value"] = "value";
+})(ValueTypes || (ValueTypes = {}));
+function getValueType(value) {
+    if (isTagComponent(value)) {
+        return ValueTypes.tagComponent;
+    }
+    if (isTagInstance(value)) {
+        return ValueTypes.tag;
+    }
+    if (isTagArray(value)) {
+        return ValueTypes.tagArray;
+    }
+    return ValueTypes.value;
+}
+export function isTagArray(value) {
+    return value instanceof Array && value.every(x => isTagInstance(x));
+}
+export function processSubjectValue(value, result, // could be tag via result.tag
+template, // <template end interpolate /> (will be removed)
+tag, // owner
+options) {
+    const valueType = getValueType(value);
+    // Previously was simple value, now its a tag of some sort
+    const resultTag = result;
+    const clone = resultTag.clone;
+    if (valueType !== ValueTypes.value && clone) {
+        const parent = clone.parentNode;
+        template.removeAttribute('removedAt');
+        parent.insertBefore(template, clone);
+        parent.removeChild(clone);
+        delete resultTag.clone;
+        // result.clone = template
+    }
+    switch (valueType) {
+        case ValueTypes.tag:
+            return {
+                clones: processTag(value, result, template, tag, options)
+            };
+        case ValueTypes.tagArray:
+            return {
+                clones: processTagArray(result, value, template, tag, options)
+            };
+        case ValueTypes.tagComponent:
+            return {
+                clones: processSubjectComponent(value, result, template, tag, options)
+            };
+    }
+    // *if processing WAS a tag BUT NOW its some other non-tag value
+    if (result.tag) {
+        return {
+            clones: [],
+            promise: processWasTag(value, result, template, options),
+        };
+    }
+    return {
+        clones: processRegularValue(value, result, template, tag)
+    };
+}
+function processRegularValue(value, result, // could be tag via result.tag
+template, // <template end interpolate /> (will be removed)
+tag) {
+    const before = result.clone || template; // Either the template is on the doc OR its the first element we last put on doc
+    // Processing of regular values
+    const clone = updateBetweenTemplates(value, before);
+    result.clone = clone; // remember single element put down, for future updates
+    const clones = [];
+    const oldPos = tag.clones.indexOf(before); // is the insertBefore guide being considered one of the tags clones?
+    const isOnlyGuideInClones = oldPos >= 0 && !tag.clones.includes(clone);
+    const exchangeGuideForClone = isOnlyGuideInClones && !before.parentNode; // guide is in clones AND guide is not on the document
+    if (exchangeGuideForClone) {
+        tag.clones.splice(oldPos, 1); // remove insertBefore guide from tag
+        tag.clones.push(clone); // exchange guide for element actually on document
+        clones.push(clone); // record the one element that in the end is on the document
+    }
+    return clones;
+}
+export function processTag(value, result, // could be tag via result.tag
+template, // <template end interpolate /> (will be removed)
+tag, // owner
+options) {
+    // first time seeing this tag?
+    if (!value.tagSupport) {
+        value.tagSupport = getTagSupport({});
+        // asking me to render will cause my parent to render
+        value.tagSupport.mutatingRender = tag.tagSupport.mutatingRender;
+        value.tagSupport.oldest = value.tagSupport.oldest || value;
+        tag.children.push(value);
+        value.ownerTag = tag;
+        result.sideTag = tag;
+    }
+    // (result as any).template = template
+    result.template = template;
+    const clones = processTagResult(value, result, // Function will attach result.tag
+    template, options);
+    return clones;
+}
+function processWasTag(value, result, // could be tag via result.tag,
+template, // <template end interpolate /> (will be removed)
+options) {
+    const tag = result.tag;
+    // put the template back
+    const lastFirstChild = result.clone || template; // result.tag.clones[0] // template.lastFirstChild
+    // const parentNode = lastFirstChild.parentNode || template.parentNode
+    // put the template back down
+    lastFirstChild.parentNode.insertBefore(template, lastFirstChild);
+    // cleanup old
+    if (result.clone) {
+        result.clone.parentNode.removeChild(result.clone);
+    }
+    delete result.tag;
+    const stagger = options.counts.removed;
+    const promise = tag.destroy({ stagger }).then(animated => options.counts.removed = stagger + animated);
+    delete result.tag;
+    const clone = updateBetweenTemplates(value, template);
+    result.clone = clone;
+    return promise;
+}
+//# sourceMappingURL=processSubjectValue.function.js.map

package/js/processSubjectValue.function.js.map

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

package/js/processTagArray.d.ts

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

package/js/processTagArray.js

@@ -1,28 +1,44 @@
-import { processTagResult } from "./interpolateTemplate.js";
+import { getTagSupport } from "./getTagSupport.js";
+import { processTagResult } from "./processTagResult.function.js";
 export function processTagArray(result, value, // arry of Tag classes
 template, // <template end interpolate />
-ownerTag, counts) {
+ownerTag, options) {
+    const clones = [];
     result.lastArray = result.lastArray || []; // {tag, index}[] populated in processTagResult
+    result.template = template;
     let removed = 0;
     /** 🗑️ remove previous items first */
     result.lastArray = result.lastArray.filter((item, index) => {
-        const lessLength = value.length - 1 < index - removed;
+        const newLength = value.length - 1;
+        const at = index - removed;
+        const lessLength = newLength < at;
         const subTag = value[index - removed];
         const subArrayValue = subTag?.arrayValue;
-        if (lessLength || subArrayValue !== item.tag.arrayValue) {
+        const destroyItem = lessLength || subArrayValue !== item.tag.arrayValue;
+        if (destroyItem) {
             const last = result.lastArray[index];
             const tag = last.tag;
-            tag.destroy(counts.removed, false);
+            tag.destroy({
+                stagger: options.counts.removed,
+                byParent: false
+            });
             ++removed;
-            ++counts.removed;
+            ++options.counts.removed;
             return false;
         }
         return true;
     });
+    // const masterBefore = template || (template as any).clone
+    const before = template || template.clone;
     value.forEach((subTag, index) => {
-        subTag.tagSupport = ownerTag.tagSupport;
+        subTag.tagSupport = getTagSupport({}); // {...ownerTag.tagSupport} // ownerTag.tagSupport.templater
+        subTag.tagSupport.mutatingRender = () => {
+            ownerTag.tagSupport.render();
+            return subTag;
+        }; // fake having a render function
         subTag.ownerTag = ownerTag;
         ownerTag.children.push(subTag);
+        // check for html``.key()
         if (subTag.arrayValue === undefined) {
             // appears arrayValue is not there but maybe arrayValue is actually the value of undefined
             if (!Object.keys(subTag).includes('arrayValue')) {
@@ -33,17 +49,18 @@ ownerTag, counts) {
         }
         const previous = result.lastArray[index];
         if (previous) {
-            if (previous.tag.arrayValue === subTag.arrayValue) {
+            const isSame = previous.tag.arrayValue === subTag.arrayValue;
+            if (isSame) {
                 previous.tag.updateValues(subTag.values);
             }
-            return;
+            return [];
         }
-        const before = template || template.clone;
-        processTagResult(subTag, result, before, {
+        const nextClones = processTagResult(subTag, result, before, {
             index,
-            counts,
+            ...options,
         });
+        clones.push(...nextClones);
     });
-    return;
+    return clones;
 }
 //# sourceMappingURL=processTagArray.js.map

package/js/processTagArray.js.map

@@ -1 +1 @@
-{"version":3,"file":"processTagArray.js","sourceRoot":"","sources":["../ts/processTagArray.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAEnE,MAAM,UAAU,eAAe,CAC7B,MAAW,EACX,KAAY,EAAE,sBAAsB;AACpC,QAAiB,EAAE,+BAA+B;AAClD,QAAa,EACb,MAAc;IAEd,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAA,CAAC,+CAA+C;IAEzF,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,sCAAsC;IACtC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CACzC,IAAS,EACT,KAAa,EACb,EAAE;QACF,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,GAAC,CAAC,GAAG,KAAK,GAAG,OAAO,CAAA;QACnD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,CAAA;QACrC,MAAM,aAAa,GAAG,MAAM,EAAE,UAAU,CAAA;QACxC,IAAG,UAAU,IAAI,aAAa,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YACvD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAClC,EAAE,OAAO,CAAA;YACT,EAAE,MAAM,CAAC,OAAO,CAAA;YAChB,OAAO,KAAK,CAAA;QACd,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC9B,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;QACvC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAC1B,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9B,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,0FAA0F;YAC1F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,mEAAmE,CAAC,CACzF;gBAAC,GAAW,CAAC,IAAI,GAAG,eAAe,CAAA;gBACpC,MAAM,GAAG,CAAA;YACX,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;gBAClD,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC1C,CAAC;YACD,OAAM;QACR,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,IAAK,QAAgB,CAAC,KAAK,CAAA;QAClD,gBAAgB,CACd,MAAM,EACN,MAAM,EACN,MAAM,EACN;YACE,KAAK;YACL,MAAM;SACP,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAM;AACR,CAAC"}
+{"version":3,"file":"processTagArray.js","sourceRoot":"","sources":["../ts/processTagArray.ts"],"names":[],"mappings":"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"}

package/js/processTagResult.function.d.ts

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

package/js/processTagResult.function.js

@@ -0,0 +1,43 @@
+export function processTagResult(tag, result, // used for recording past and current value
+insertBefore, // <template end interpolate />
+{ index, counts, forceElement, }) {
+    // *for
+    if (index !== undefined) {
+        const resultArray = result.lastArray;
+        const existing = resultArray[index];
+        if (existing?.tag.isLikeTag(tag)) {
+            existing.tag.updateByTag(tag);
+            return [];
+        }
+        // Added to previous array
+        resultArray.push({
+            tag, index
+        });
+        const lastFirstChild = insertBefore; // tag.clones[0] // insertBefore.lastFirstChild    
+        const clones = tag.buildBeforeElement(lastFirstChild, { counts, forceElement });
+        return clones;
+    }
+    // *if appears we already have seen
+    const subjectTag = result;
+    const rTag = subjectTag.tag;
+    if (rTag && !forceElement) {
+        // are we just updating an if we already had?
+        if (rTag.isLikeTag(tag)) {
+            // components
+            if (result instanceof Function) {
+                const newTag = result(rTag.tagSupport);
+                rTag.updateByTag(newTag);
+                return [];
+            }
+            rTag.updateByTag(tag);
+            return []; // no clones created in element already on stage
+        }
+    }
+    const clones = tag.buildBeforeElement(insertBefore, {
+        counts,
+        forceElement,
+    });
+    subjectTag.tag = tag; // let reprocessing know we saw this previously as an if
+    return clones;
+}
+//# sourceMappingURL=processTagResult.function.js.map

package/js/processTagResult.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processTagResult.function.js","sourceRoot":"","sources":["../ts/processTagResult.function.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,MAA+C,EAAE,4CAA4C;AAC7F,YAAqB,EAAE,+BAA+B;AACtD,EACE,KAAK,EAAE,MAAM,EAAE,YAAY,GAK5B;IAED,OAAO;IACP,IAAG,KAAK,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,WAAW,GAAI,MAA0B,CAAC,SAAS,CAAA;QACzD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QAEnC,IAAG,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAC7B,OAAO,EAAE,CAAA;QACX,CAAC;QAGD,0BAA0B;QAC1B,WAAW,CAAC,IAAI,CAAC;YACf,GAAG,EAAE,KAAK;SACX,CAAC,CAAA;QAEF,MAAM,cAAc,GAAG,YAAY,CAAA,CAAC,mDAAmD;QACvF,MAAM,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC,cAAc,EAAE,EAAC,MAAM,EAAE,YAAY,EAAC,CAAC,CAAA;QAE7E,OAAO,MAAM,CAAA;IACf,CAAC;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,MAAoB,CAAA;IACvC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAA;IAC3B,IAAG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACzB,6CAA6C;QAC7C,IAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,aAAa;YACb,IAAG,MAAM,YAAY,QAAQ,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBACtC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;gBACxB,OAAO,EAAE,CAAA;YACX,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YAErB,OAAO,EAAE,CAAA,CAAC,gDAAgD;QAC5D,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC,YAAY,EAAE;QAClD,MAAM;QACN,YAAY;KACb,CAAC,CAAA;IACF,UAAU,CAAC,GAAG,GAAG,GAAG,CAAA,CAAC,wDAAwD;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/providers.d.ts

@@ -1,21 +1,12 @@
-import { Tag } from "./Tag.class.js";
 export type Provider = {
     constructMethod: any;
     instance: any;
     clone: any;
 };
-export declare const config: {
-    providers: Provider[];
-    currentTag: Tag | undefined;
-    ownerTag: Tag | undefined;
-};
+type functionProvider = <T>() => T;
+type classProvider = new <T>(...args: any[]) => T;
 export declare const providers: {
-    /**
-     * @template T
-     * @param {(new (...args: any[]) => T) | () => T} constructor
-     * @returns {T}
-     */
-    create: (constructMethod: any) => any;
+    create: <T>(constructMethod: classProvider | functionProvider) => T;
     /**
      * @template T
      * @param {(new (...args: any[]) => T) | () => T} constructor
@@ -23,3 +14,4 @@ export declare const providers: {
      */
     inject: (constructor: any) => any;
 };
+export {};

package/js/providers.js

@@ -1,19 +1,17 @@
 import { deepClone } from "./deepFunctions.js";
-import { setUse } from "./tagRunner.js";
-export const config = {
+import { setUse } from "./setUse.function.js";
+// TODO: rename
+setUse.memory.providerConfig = {
     providers: [],
-    currentTag: undefined,
+    currentTagSupport: undefined,
     ownerTag: undefined,
 };
 function get(constructMethod) {
-    return config.providers.find(provider => provider.constructMethod === constructMethod);
+    const config = setUse.memory.providerConfig;
+    const providers = config.providers;
+    return providers.find(provider => provider.constructMethod === constructMethod);
 }
 export const providers = {
-    /**
-     * @template T
-     * @param {(new (...args: any[]) => T) | () => T} constructor
-     * @returns {T}
-     */
     create: (constructMethod) => {
         const existing = get(constructMethod);
         if (existing) {
@@ -22,6 +20,7 @@ export const providers = {
         }
         // Providers with provider requirements just need to use providers.create() and providers.inject()
         const instance = constructMethod.constructor ? new constructMethod() : constructMethod();
+        const config = setUse.memory.providerConfig;
         config.providers.push({
             constructMethod,
             instance,
@@ -39,11 +38,12 @@ export const providers = {
         if (oldValue) {
             return oldValue.instance;
         }
+        const config = setUse.memory.providerConfig;
         let owner = {
             ownerTag: config.ownerTag
         };
         while (owner.ownerTag) {
-            const ownerProviders = owner.ownerTag.providers;
+            const ownerProviders = owner.ownerTag.tagSupport.memory.providers;
             const provider = ownerProviders.find(provider => {
                 if (provider.constructMethod === constructor) {
                     return true;
@@ -56,23 +56,31 @@ export const providers = {
             }
             owner = owner.ownerTag; // cause reloop
         }
-        const msg = `Could not inject provider: ${constructor}`;
+        const msg = `Could not inject provider: ${constructor.name} ${constructor}`;
         console.warn(`${msg}. Available providers`, config.providers);
         throw new Error(msg);
     }
 };
 setUse({
-    beforeRedraw: (_tagSupport, tag) => {
-        config.currentTag = tag;
-        config.ownerTag = tag.ownerTag;
-        if (tag.providers.length) {
-            config.providers.length = 0;
-            config.providers.push(...tag.providers);
-        }
+    beforeRender: (tagSupport, ownerTag) => {
+        run(tagSupport, ownerTag);
+    },
+    beforeRedraw: (tagSupport, tag) => {
+        run(tagSupport, tag.ownerTag);
     },
-    afterRender: (_tagSupport, tag) => {
-        tag.providers = [...config.providers];
+    afterRender: (tagSupport) => {
+        const config = setUse.memory.providerConfig;
+        tagSupport.memory.providers = [...config.providers];
         config.providers.length = 0;
     }
 });
+function run(tagSupport, ownerTag) {
+    const config = setUse.memory.providerConfig;
+    config.currentTagSuport = tagSupport;
+    config.ownerTag = ownerTag;
+    if (tagSupport.memory.providers.length) {
+        config.providers.length = 0;
+        config.providers.push(...tagSupport.memory.providers);
+    }
+}
 //# sourceMappingURL=providers.js.map

package/js/providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"providers.js","sourceRoot":"","sources":["../ts/providers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"providers.js","sourceRoot":"","sources":["../ts/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAQ7C,eAAe;AACf,MAAM,CAAC,MAAM,CAAC,cAAc,GAAG;IAC7B,SAAS,EAAE,EAAgB;IAE3B,iBAAiB,EAAE,SAAmC;IACtD,QAAQ,EAAE,SAA4B;CACvC,CAAA;AAED,SAAS,GAAG,CAAC,eAAyB;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;IAC3C,MAAM,SAAS,GAAe,MAAM,CAAC,SAAS,CAAA;IAC9C,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,KAAK,eAAe,CAAC,CAAA;AACjF,CAAC;AAKD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,CACN,eAAiD,EAC9C,EAAE;QACL,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,CAAC,CAAA;QACrC,IAAG,QAAQ,EAAE,CAAC;YACZ,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC7C,OAAO,QAAQ,CAAC,QAAQ,CAAA;QAC1B,CAAC;QAED,kGAAkG;QAClG,MAAM,QAAQ,GAAM,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,IAAK,eAAiC,EAAE,CAAC,CAAC,CAAE,eAAoC,EAAE,CAAA;QAEpI,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;QAC3C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACpB,eAAe;YACf,QAAQ;YACR,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;OAIG;IACH,MAAM,EAAE,CAAC,WAAgB,EAAE,EAAE;QAC3B,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,CAAA;QACjC,IAAG,QAAQ,EAAE,CAAC;YACZ,OAAO,QAAQ,CAAC,QAAQ,CAAA;QAC1B,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;QAC3C,IAAI,KAAK,GAAG;YACV,QAAQ,EAAE,MAAM,CAAC,QAAQ;SACnB,CAAA;QAER,OAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAA;YAEjE,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAC9C,IAAG,QAAQ,CAAC,eAAe,KAAK,WAAW,EAAE,CAAC;oBAC5C,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,IAAG,QAAQ,EAAE,CAAC;gBACZ,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,oDAAoD;gBAClG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC/B,OAAO,QAAQ,CAAC,QAAQ,CAAA;YAC1B,CAAC;YAED,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAA,CAAC,eAAe;QACxC,CAAC;QAED,MAAM,GAAG,GAAG,8BAA8B,WAAW,CAAC,IAAI,IAAI,WAAW,EAAE,CAAA;QAC3E,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;CACF,CAAA;AAED,MAAM,CAAC;IACL,YAAY,EAAE,CACZ,UAAsB,EACtB,QAAa,EACb,EAAE;QACF,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC3B,CAAC;IACD,YAAY,EAAE,CACZ,UAAsB,EACtB,GAAQ,EACR,EAAE;QACF,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,QAAe,CAAC,CAAA;IACtC,CAAC;IACD,WAAW,EAAE,CACX,UAAsB,EAEtB,EAAE;QACF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;QAC3C,UAAU,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;QACnD,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IAC7B,CAAC;CACF,CAAC,CAAA;AAEF,SAAS,GAAG,CACV,UAAsB,EACtB,QAAa;IAGb,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAA;IAC3C,MAAM,CAAC,gBAAgB,GAAG,UAAU,CAAA;IAEpC,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE1B,IAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QAC3B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;AACH,CAAC"}

package/js/redrawTag.function.d.ts

@@ -0,0 +1,7 @@
+import { TemplaterResult } from "./templater.utils.js";
+import { Tag } from "./Tag.class.js";
+export declare function redrawTag(existingTag: Tag | undefined, templater: TemplaterResult, // latest tag function to call for rendering
+ownerTag?: Tag): {
+    remit: boolean;
+    retag: Tag;
+};

package/js/redrawTag.function.js

@@ -0,0 +1,8 @@
+import { getTagSupport } from "./getTagSupport.js";
+export function redrawTag(existingTag, templater, // latest tag function to call for rendering
+ownerTag) {
+    const tagSupport = existingTag?.tagSupport || getTagSupport(templater);
+    const result = templater.renderWithSupport(tagSupport, existingTag, ownerTag);
+    return result;
+}
+//# sourceMappingURL=redrawTag.function.js.map

package/js/redrawTag.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redrawTag.function.js","sourceRoot":"","sources":["../ts/redrawTag.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAIlD,MAAM,UAAU,SAAS,CACvB,WAA4B,EAC5B,SAA0B,EAAE,4CAA4C;AACxE,QAAc;IAEd,MAAM,UAAU,GAAG,WAAW,EAAE,UAAU,IAAI,aAAa,CAAC,SAAS,CAAC,CAAA;IAEtE,MAAM,MAAM,GAAG,SAAS,CAAC,iBAAiB,CACxC,UAAU,EACV,WAAW,EACX,QAAQ,CACT,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/render.d.ts

@@ -1,6 +1 @@
-import { Context, Tag } from "./Tag.class.js";
-export declare function buildItemTagMap(tag: Tag, template: {
-    string: string;
-    context: Context;
-}, // {string, context}
-insertBefore: Element): (ChildNode | Element)[];
+export declare function buildClones(temporary: Element, insertBefore: Element): ChildNode[];

package/js/render.js

@@ -1,22 +1,7 @@
-import { interpolateElement } from "./interpolateElement.js";
-export function buildItemTagMap(tag, template, // {string, context}
-insertBefore) {
-    const temporary = document.createElement('div');
-    temporary.id = 'tag-temp-holder';
-    // render content with a first child that we can know is our first element
-    temporary.innerHTML = '<div></div>' + template.string;
-    const context = tag.update();
-    interpolateElement(temporary, context, tag);
-    const clones = buildClones(temporary, insertBefore);
-    tag.clones.push(...clones);
-    return clones;
-}
-function buildClones(temporary, insertBefore) {
+export function buildClones(temporary, insertBefore) {
     const clones = [];
-    const templateClone = temporary.children[0];
-    const sibling = templateClone; // a div we added
-    let nextSibling = sibling.nextSibling;
-    temporary.removeChild(templateClone); // remove the div
+    const template = temporary.children[0];
+    let nextSibling = template.content.firstChild;
     while (nextSibling) {
         const nextNextSibling = nextSibling.nextSibling;
         buildSibling(nextSibling, insertBefore);
@@ -26,6 +11,7 @@ function buildClones(temporary, insertBefore) {
     return clones;
 }
 function buildSibling(nextSibling, insertBefore) {
-    insertBefore.parentNode.insertBefore(nextSibling, insertBefore);
+    const parentNode = insertBefore.parentNode;
+    parentNode.insertBefore(nextSibling, insertBefore);
 }
 //# sourceMappingURL=render.js.map

package/js/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../ts/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,MAAM,UAAU,eAAe,CAC7B,GAAQ,EACR,QAA4C,EAAE,oBAAoB;AAClE,YAAqB;IAErB,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAC/C,SAAS,CAAC,EAAE,GAAG,iBAAiB,CAAA;IAEhC,0EAA0E;IAC1E,SAAS,CAAC,SAAS,GAAG,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAA;IAErD,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;IAC5B,kBAAkB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;IAE3C,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IACnD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAE,GAAG,MAAM,CAAE,CAAA;IAE5B,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,WAAW,CAClB,SAAkB,EAClB,YAAqB;IAErB,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG,aAAa,CAAA,CAAC,iBAAiB;IAC/C,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;IACrC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA,CAAC,iBAAiB;IAEtD,OAAO,WAAW,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAA;QAC/C,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QACvC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxB,WAAW,GAAG,eAAe,CAAA;IAC/B,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,YAAY,CACnB,WAAsB,EACtB,YAAqB;IAEpB,YAAY,CAAC,UAAyB,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;AACjF,CAAC"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../ts/render.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CACzB,SAAkB,EAClB,YAAqB;IAErB,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAA;IAC7D,IAAI,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAA;IAE7C,OAAO,WAAW,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAA;QAC/C,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QACvC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxB,WAAW,GAAG,eAAe,CAAA;IAC/B,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,YAAY,CACnB,WAAsB,EACtB,YAAqB;IAErB,MAAM,UAAU,GAAG,YAAY,CAAC,UAAwB,CAAA;IACxD,UAAU,CAAC,YAAY,CACrB,WAAW,EACX,YAAY,CACb,CAAA;AACH,CAAC"}

package/js/renderAppToElement.d.ts

@@ -1,8 +1,14 @@
 import { TagSupport } from "./getTagSupport.js";
+import { TagComponent, TemplaterResult } from "./templater.utils.js";
 import { Tag } from "./Tag.class.js";
-import { TemplaterResult } from "./tag.js";
-export declare function renderAppToElement(app: (...args: unknown[]) => TemplaterResult, element: Element, props: unknown): void;
+export declare function renderAppToElement(app: TagComponent, // (...args: unknown[]) => TemplaterResult,
+element: Element, props: unknown): {
+    tag: Tag;
+    tags: TagComponent[];
+};
 export declare function applyTagUpdater(wrapper: TemplaterResult): {
     tag: Tag;
     tagSupport: TagSupport;
 };
+/** Overwrites arguments.tagSupport.mutatingRender */
+export declare function addAppTagRender(tagSupport: TagSupport, tag: Tag): void;

package/js/renderAppToElement.js

@@ -1,38 +1,57 @@
-import { interpolateElement } from "./interpolateElement.js";
-import { getTagSupport } from "./getTagSupport.js";
 import { runBeforeRender } from "./tagRunner.js";
-export function renderAppToElement(app, element, props) {
+const appElements = [];
+export function renderAppToElement(app, // (...args: unknown[]) => TemplaterResult,
+element, props) {
+    const appElmIndex = appElements.findIndex(appElm => appElm.element === element);
+    if (appElmIndex >= 0) {
+        appElements[appElmIndex].tag.destroy();
+        appElements.splice(appElmIndex, 1);
+        console.warn('Found and destroyed app element already rendered to element', { element });
+    }
     // Create the app which returns [props, runOneTimeFunction]
     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;
+    tag.appElement = element;
+    addAppTagRender(tagSupport, tag);
+    // const context = tag.updateValues(tag.values)
+    const templateElm = document.createElement('template');
+    templateElm.setAttribute('tag-detail', 'app-template-placeholder');
+    element.appendChild(templateElm);
+    tag.buildBeforeElement(templateElm);
+    element.setUse = app.original.setUse;
+    appElements.push({ element, tag });
+    return { tag, tags: app.original.tags };
+}
+export function applyTagUpdater(wrapper) {
+    const tagSupport = wrapper.tagSupport; // getTagSupport(0, wrapper)
+    runBeforeRender(tagSupport, undefined);
+    // Call the apps function for our tag templater
+    // const templater = tagSupport.templater as TemplaterResult
+    const tag = wrapper.wrapper(); // templater.wrapper()
+    tag.tagSupport = tagSupport;
+    tag.afterRender();
+    return { tag, tagSupport };
+}
+/** Overwrites arguments.tagSupport.mutatingRender */
+export function addAppTagRender(tagSupport, tag) {
     let lastTag;
     tagSupport.mutatingRender = () => {
-        runBeforeRender(tagSupport, tag);
         tag.beforeRedraw();
-        const fromTag = lastTag = wrapper.wrapper();
-        fromTag.setSupport(tag.tagSupport);
+        const templater = tagSupport.templater; // wrapper
+        const fromTag = lastTag = templater.wrapper();
+        // tagSupport.props = fromTag.tagSupport.props
+        tagSupport.latestProps = fromTag.tagSupport.props;
+        tagSupport.latestClonedProps = fromTag.tagSupport.clonedProps;
+        fromTag.setSupport(tagSupport);
         tag.afterRender();
         tag.updateByTag(fromTag);
         if (lastTag) {
-            lastTag.destroy(0);
+            lastTag.destroy({ stagger: 0 });
         }
+        tagSupport.newest = fromTag;
         return lastTag;
     };
-    const context = tag.updateValues(tag.values);
-    const template = tag.getTemplate();
-    element.innerHTML = template.string;
-    interpolateElement(element, context, tag);
-}
-export function applyTagUpdater(wrapper) {
-    const tagSupport = getTagSupport(wrapper);
-    runBeforeRender(tagSupport);
-    // Call the apps function for our tag templater
-    const templater = tagSupport.templater;
-    const tag = templater.wrapper();
-    tag.tagSupport = tagSupport;
-    tag.afterRender();
-    return { tag, tagSupport };
 }
 //# sourceMappingURL=renderAppToElement.js.map

package/js/renderAppToElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderAppToElement.js","sourceRoot":"","sources":["../ts/renderAppToElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAc,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGhD,MAAM,UAAU,kBAAkB,CAChC,GAA4C,EAC5C,OAAgB,EAChB,KAAc;IAEd,2DAA2D;IAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;IAE1B,kFAAkF;IAClF,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IACvC,MAAM,EAAC,GAAG,EAAE,UAAU,EAAC,GAAG,MAAM,CAAA;IAEhC,IAAI,OAAO,CAAA;IACX,UAAU,CAAC,cAAc,GAAG,GAAG,EAAE;QAC/B,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;QAChC,GAAG,CAAC,YAAY,EAAE,CAAA;QAElB,MAAM,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;QAE3C,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAClC,GAAG,CAAC,WAAW,EAAE,CAAA;QACjB,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QAExB,IAAG,OAAO,EAAE,CAAC;YACX,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACpB,CAAC;QAED,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5C,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;IAElC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAA;IACnC,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;AAE3C,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,OAAwB;IAExB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IACzC,eAAe,CAAC,UAAU,CAAC,CAAA;IAE3B,+CAA+C;IAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,SAA4B,CAAA;IACzD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAA;IAE/B,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC3B,GAAG,CAAC,WAAW,EAAE,CAAA;IAEjB,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC"}
+{"version":3,"file":"renderAppToElement.js","sourceRoot":"","sources":["../ts/renderAppToElement.ts"],"names":[],"mappings":"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"}