taggedjs 2.5.24 → 2.6.1

package/js/tag/Support.class.js

@@ -1,290 +1,41 @@
-import { ValueTypes } from './ValueTypes.enum.js';
-import { deepClone } from '../deepFunctions.js';
-import { isTagComponent } from '../isInstance.js';
-import { cloneTagJsValue, cloneValueArray } from './cloneValueArray.function.js';
-import { runBeforeDestroy } from './tagRunner.js';
-import { getChildTagsToDestroy } from './destroy.support.js';
-import { elementDestroyCheck } from './elementDestroyCheck.function.js';
-import { updateContextItem } from './update/updateContextItem.function.js';
-import { processNewValue } from './update/processNewValue.function.js';
-import { exchangeParsedForValues } from '../interpolations/optimizers/htmlInterpolationToDomMeta.function.js';
-import { attachDomElement } from '../interpolations/optimizers/metaAttachDomElements.function.js';
-import { getDomMeta } from './domMetaCollector.js';
+import { clonePropsBy } from './clonePropsBy.function.js';
+import { Subject } from '../subject/Subject.class.js';
 /** used only for apps, otherwise use Support */
-// TODO: We need to split Support and simple tag support apart
-export class BaseSupport {
-    templater;
-    subject;
-    isApp = true;
-    appElement; // only seen on this.getAppSupport().appElement
-    strings;
-    dom;
-    values;
-    propsConfig;
-    // stays with current render
-    state = [];
-    hasLiveElements = false;
-    constructor(templater, subject, castedProps) {
-        this.templater = templater;
-        this.subject = subject;
-        const props = templater.props; // natural props
-        this.propsConfig = this.clonePropsBy(props, castedProps);
-    }
-    clonePropsBy(props, castedProps) {
-        const children = this.templater.children; // children tags passed in as arguments
-        const kidValue = children.value;
-        const latestCloned = props.map(props => cloneTagJsValue(props)
-        // deepClone(props)
-        );
-        return this.propsConfig = {
-            latest: props,
-            latestCloned, // assume its HTML children and then detect
-            castProps: castedProps,
-            lastClonedKidValues: kidValue.map(kid => {
-                const cloneValues = cloneValueArray(kid.values);
-                return cloneValues;
-            })
-        };
-    }
-    getHtmlDomMeta(fragment, options = {
-        counts: { added: 0, removed: 0 },
-    }) {
-        const thisTag = this.templater.tag;
-        const context = this.update();
-        let orgDomMeta;
-        if (thisTag.tagJsType === ValueTypes.dom) {
-            orgDomMeta = thisTag.dom;
-        }
-        else {
-            orgDomMeta = getDomMeta(thisTag.strings, thisTag.values);
-        }
-        const domMeta = deepClone(orgDomMeta);
-        exchangeParsedForValues(domMeta, context);
-        attachDomElement(domMeta, context, this, fragment, options.counts, fragment);
-        return domMeta;
-    }
-    /** Function that kicks off actually putting tags down as HTML elements */
-    buildBeforeElement(fragment = document.createDocumentFragment(), options) {
-        const subject = this.subject;
-        const global = this.subject.global;
-        global.oldest = this;
-        global.newest = this;
-        subject.support = this;
-        this.hasLiveElements = true;
-        const htmlDomMeta = this.getHtmlDomMeta(fragment, options);
-        attachClonesToSupport(htmlDomMeta, this.subject.global.clones);
-        return fragment;
-    }
-    updateBy(support) {
-        const tempTag = support.templater.tag;
-        this.updateConfig(tempTag, tempTag.values);
-    }
-    /** triggers values to render */
-    updateConfig(tag, values) {
-        if (tag.tagJsType === ValueTypes.dom) {
-            this.dom = tag.dom;
-        }
-        else {
-            this.strings = tag.strings;
-        }
-        this.updateValues(values);
-    }
-    updateValues(values) {
-        this.values = values;
-        return this.updateContext(this.subject.global.context);
-    }
-    update() {
-        return this.updateContext(this.subject.global.context);
-    }
-    updateContext(context) {
-        const thisTag = this.templater.tag;
-        // const strings = this.strings || thisTag.strings
-        const values = this.values || thisTag.values;
-        // TODO: loop specific number of times instead of building an array
-        const array = 'x,'.repeat(values.length).split(','); // strings
-        array.forEach((_string, index) => updateOneContext(values, index, context, this));
-        return context;
-    }
-    destroy(options = {
-        stagger: 0,
-    }) {
-        const global = this.subject.global;
-        const childTags = options.byParent ? [] : getChildTagsToDestroy(this.subject.global.childTags); // .toReversed()
-        if (isTagComponent(this.templater)) {
-            global.destroy$.next();
-            runBeforeDestroy(this, this);
-        }
-        this.destroySubscriptions();
-        // signify immediately child has been deleted (looked for during event processing)
-        for (let index = childTags.length - 1; index >= 0; --index) {
-            const child = childTags[index];
-            const subGlobal = child.subject.global;
-            delete subGlobal.newest;
-            subGlobal.deleted = true;
-            if (isTagComponent(child.templater)) {
-                runBeforeDestroy(child, child);
-            }
-            child.destroySubscriptions();
-            // resetSupport(this)
-        }
-        resetSupport(this);
-        // let mainPromise: Promise<number | (number | void | undefined)[]> | undefined    
-        // first paint
-        const { stagger, promises } = this.smartRemoveKids(options);
-        options.stagger = stagger;
-        if (promises.length) {
-            return Promise.all(promises).then(() => options.stagger);
-        }
-        return options.stagger;
-    }
-    smartRemoveKids(options = {
-        stagger: 0,
-    }) {
-        const startStagger = options.stagger;
-        const promises = [];
-        const myClones = this.subject.global.clones;
-        this.subject.global.childTags.forEach(childTag => {
-            const clones = childTag.subject.global.clones;
-            let cloneOne = clones[0];
-            if (cloneOne === undefined) {
-                const { stagger, promises: newPromises } = childTag.smartRemoveKids(options);
-                options.stagger = options.stagger + stagger;
-                promises.push(...newPromises);
-                return { promise: Promise.all(promises), stagger: options.stagger };
-            }
-            let count = 0;
-            // let deleted = false
-            while (cloneOne.parentNode && count < 5) {
-                if (myClones.includes(cloneOne)) {
-                    return; // no need to delete, they live within me
-                }
-                cloneOne = cloneOne.parentNode;
-                ++count;
-            }
-            // recurse
-            const { stagger, promises: newPromises } = childTag.smartRemoveKids(options);
-            options.stagger = options.stagger + stagger;
-            promises.push(...newPromises);
-        });
-        const promise = this.destroyClones({ stagger: startStagger }).promise;
-        this.subject.global.clones.length = 0;
-        this.subject.global.childTags.length = 0;
-        if (promise) {
-            promises.unshift(promise);
-        }
-        return { promises, stagger: options.stagger };
-    }
-    destroyClones(options = {
-        stagger: 0,
-    }) {
-        const oldClones = this.subject.global.clones; // .toReversed()
-        // check subjects that may have clones attached to them
-        const promises = oldClones.map(clone => this.checkCloneRemoval(clone, options.stagger)).filter(x => x); // only return promises
-        if (promises.length) {
-            return { promise: Promise.all(promises), stagger: options.stagger };
-        }
-        return { stagger: options.stagger };
-    }
-    /** Reviews elements for the presences of ondestroy */
-    checkCloneRemoval(clone, stagger) {
-        let promise;
-        const customElm = clone;
-        if (customElm.ondestroy) {
-            promise = elementDestroyCheck(customElm, stagger);
-        }
-        if (promise instanceof Promise) {
-            return promise.then(() => {
-                const parentNode = clone.parentNode;
-                // TODO: we need to remove this IF
-                if (parentNode) {
-                    parentNode.removeChild(clone);
-                }
-            });
-        }
-        const parentNode = clone.parentNode;
-        if (parentNode) {
-            parentNode.removeChild(clone);
-        }
-        const ownerSupport = this.ownerSupport;
-        if (ownerSupport) {
-            const clones = ownerSupport.subject.global.clones;
-            const index = clones.indexOf(clone);
-            if (index >= 0) {
-                clones.splice(index, 1);
-            }
-        }
-        return promise;
-    }
-    destroySubscriptions() {
-        const subs = this.subject.global.subscriptions;
-        for (let index = subs.length - 1; index >= 0; --index) {
-            subs[index].unsubscribe();
-        }
-        subs.length = 0;
-    }
-}
-export class Support extends BaseSupport {
-    templater;
-    ownerSupport;
-    subject;
-    version;
-    isApp = false;
-    constructor(templater, // at runtime rendering of a tag, it needs to be married to a new Support()
-    ownerSupport, subject, castedProps, version = 0) {
-        super(templater, subject, castedProps);
-        this.templater = templater;
-        this.ownerSupport = ownerSupport;
-        this.subject = subject;
-        this.version = version;
-    }
-    getAppSupport() {
-        let tag = this;
-        while (tag.ownerSupport) {
-            tag = tag.ownerSupport;
-        }
-        return tag;
-    }
-}
-export function resetSupport(support) {
-    const global = support.subject.global;
-    // TODO: We maybe able to replace with: global.context.length = 0
-    global.context = [];
-    delete global.oldest; // may not be needed
-    delete global.newest;
-    const subject = support.subject;
-    delete subject.support;
+export function getBaseSupport(templater, subject, castedProps) {
+    const baseSupport = {
+        templater,
+        subject,
+        castedProps,
+        state: [], // TODO: this is not needed for every type of  tag
+        appSupport: undefined,
+    };
+    baseSupport.appSupport = baseSupport;
+    const global = subject.global;
+    global.blocked = [];
+    global.destroy$ = new Subject();
+    const props = templater.props; // natural props
+    if (props) {
+        baseSupport.propsConfig = clonePropsBy(baseSupport, props, castedProps);
+    }
+    return baseSupport;
 }
-function updateOneContext(values, index, context, support) {
-    const hasValue = values.length > index;
-    if (!hasValue) {
-        return;
-    }
-    const value = values[index];
-    // is something already there?
-    const exists = context.length > index;
-    if (exists) {
-        if (support.subject.global.deleted) {
-            const valueSupport = (value && value.support);
-            if (valueSupport) {
-                valueSupport.destroy();
-                return context; // item was deleted, no need to emit
-            }
-        }
-        return updateContextItem(context, index, value);
-    }
-    // 🆕 First time values below
-    context[index] = processNewValue(value, support);
+export function getSupport(templater, // at runtime rendering of a tag, it needs to be married to a new Support()
+ownerSupport, appSupport, subject, castedProps) {
+    const support = getBaseSupport(templater, subject, castedProps);
+    support.ownerSupport = ownerSupport;
+    support.appSupport = appSupport;
+    return support;
 }
-function attachClonesToSupport(htmlDomMeta, clones) {
-    htmlDomMeta.forEach(meta => {
-        if (meta.domElement) {
-            clones.push(meta.domElement);
-        }
-        clones.push(meta.marker);
-        if ('children' in meta) {
-            const children = meta.children;
-            attachClonesToSupport(children, clones);
-        }
-    });
+export function getHtmlSupport(templater, // at runtime rendering of a tag, it needs to be married to a new Support()
+ownerSupport, appSupport, subject, castedProps) {
+    const support = {
+        templater,
+        subject,
+        castedProps,
+        appSupport: undefined,
+    };
+    support.ownerSupport = ownerSupport;
+    support.appSupport = appSupport;
+    return support;
 }
 //# sourceMappingURL=Support.class.js.map

package/js/tag/Support.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"Support.class.js","sourceRoot":"","sources":["../../ts/tag/Support.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Support.class.js","sourceRoot":"","sources":["../../ts/tag/Support.class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAkCrD,gDAAgD;AAChD,MAAM,UAAU,cAAc,CAC5B,SAA0B,EAC1B,OAA2B,EAC3B,WAAmB;IAEnB,MAAM,WAAW,GAAG;QAClB,SAAS;QACT,OAAO;QACP,WAAW;QACX,KAAK,EAAE,EAAE,EAAE,kDAAkD;QAE7D,UAAU,EAAE,SAA+B;KAC7B,CAAA;IAEhB,WAAW,CAAC,UAAU,GAAG,WAAW,CAAA;IAEpC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,MAAM,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,MAAM,CAAC,QAAQ,GAAG,IAAI,OAAO,EAAQ,CAAA;IAErC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA,CAAE,gBAAgB;IAC/C,IAAG,KAAK,EAAE,CAAC;QACT,WAAW,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;IACzE,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAOD,MAAM,UAAU,UAAU,CACxB,SAA0B,EAAE,2EAA2E;AACvG,YAAwB,EACxB,UAAuB,EACvB,OAAoB,EACpB,WAAmB;IAEnB,MAAM,OAAO,GAAG,cAAc,CAC5B,SAAS,EACT,OAA6B,EAC7B,WAAW,CACZ,CAAA;IAED,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;IACnC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAE/B,OAAO,OAAkB,CAAA;AAC3B,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,SAA0B,EAAE,2EAA2E;AACvG,YAAwB,EACxB,UAAuB,EACvB,OAAoB,EACpB,WAAmB;IAEnB,MAAM,OAAO,GAAG;QACd,SAAS;QACT,OAAO;QACP,WAAW;QAEX,UAAU,EAAE,SAA+B;KAC7B,CAAA;IAEhB,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;IACnC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAA;IAC/B,OAAO,OAAkB,CAAA;AAC3B,CAAC"}

package/js/tag/Tag.class.d.ts

@@ -3,13 +3,15 @@ import { InterpolatedTemplates } from '../interpolations/interpolations.js';
 import { TemplaterResult } from './TemplaterResult.class.js';
 import { TagValues } from './html.js';
 import { ValueTypes } from './ValueTypes.enum.js';
-import { TagJsSubject } from './update/TagJsSubject.class.js';
-import { ObjectChildren } from '../interpolations/optimizers/ObjectNode.types.js';
+import { DomMetaMap, LikeObjectChildren } from '../interpolations/optimizers/LikeObjectElement.type.js';
+import { AnySupport } from './Support.class.js';
 export declare const variablePrefix = ":tagvar";
 export declare const variableSuffix = ":";
-export declare const escapeVariable: string;
-export declare const escapeSearch: RegExp;
-export type Context = TagJsSubject<any>[];
+export type EventCallback = (event: Event) => any;
+export type EventMem = {
+    elm: Element;
+    callback: EventCallback;
+};
 export type TagMemory = {
     state: State;
 };
@@ -18,38 +20,37 @@ export interface TagTemplate {
     string: string;
     strings: string[];
     values: unknown[];
-    domMeta?: ObjectChildren;
-}
-export declare class BaseTag {
-    values: unknown[];
-    tagJsType?: string;
-    arrayValue?: unknown;
-    templater: TemplaterResult;
-    constructor(values: unknown[]);
-    /** Used for array, such as array.map(), calls aka array.map(x => html``.key(x)) */
-    key(arrayValue: unknown): this;
+    domMetaMap?: DomMetaMap;
 }
-export declare class Tag extends BaseTag {
-    strings: string[];
+export type Tag = {
     values: unknown[];
-    tagJsType: ValueTypes;
+    tagJsType?: typeof ValueTypes.tag | typeof ValueTypes.dom;
+    templater?: TemplaterResult;
+    ownerSupport?: AnySupport;
+    arrayValue?: any;
+};
+export type StringTag = Tag & {
     children?: {
         strings: string[] | TemplateStringsArray;
         values: TagValues;
     };
-    constructor(strings: string[], values: unknown[]);
-    html(strings: string[] | TemplateStringsArray, ...values: TagValues): this;
-}
-export declare class Dom extends BaseTag {
-    dom: ObjectChildren;
+    strings: string[];
     values: unknown[];
-    tagJsType: ValueTypes;
+    key: (arrayValue: unknown) => StringTag;
+    html: (strings: string[] | TemplateStringsArray, values: TagValues) => StringTag;
+};
+export declare function getStringTag(strings: string[], values: unknown[]): StringTag;
+export type DomTag = Tag & {
     children?: {
-        dom: ObjectChildren;
+        dom: LikeObjectChildren;
         values: TagValues;
     };
-    constructor(dom: ObjectChildren, values: unknown[]);
+    dom: LikeObjectChildren;
+    values: unknown[];
+    key: (arrayValue: unknown) => DomTag;
     html: {
-        dom: (dom: ObjectChildren, ...values: TagValues) => Dom;
+        dom: (dom: LikeObjectChildren, // ObjectChildren
+        values: TagValues) => DomTag;
     };
-}
+};
+export declare function getDomTag(dom: LikeObjectChildren, values: unknown[]): DomTag;

package/js/tag/Tag.class.js

@@ -1,55 +1,43 @@
 // taggedjs-no-compile
 import { ValueTypes } from './ValueTypes.enum.js';
+import { getSupportInCycle } from './getSupportInCycle.function.js';
 export const variablePrefix = ':tagvar';
 export const variableSuffix = ':';
-export const escapeVariable = '--' + variablePrefix + '--';
-export const escapeSearch = new RegExp(escapeVariable, 'g');
-export class BaseTag {
-    values;
-    tagJsType;
-    // present only when an array. Populated by Tag.key()
-    arrayValue;
-    templater;
-    constructor(values) {
-        this.values = values;
-    }
-    /** Used for array, such as array.map(), calls aka array.map(x => html``.key(x)) */
-    key(arrayValue) {
-        this.arrayValue = arrayValue;
-        return this;
-    }
-}
-export class Tag extends BaseTag {
-    strings;
-    values;
-    tagJsType = ValueTypes.tag;
-    children;
-    constructor(strings, values) {
-        super(values);
-        this.strings = strings;
-        this.values = values;
-    }
-    html(strings, ...values) {
-        this.children = { strings, values };
-        return this;
-    }
+export function getStringTag(strings, values) {
+    const tag = {
+        values,
+        ownerSupport: getSupportInCycle(),
+        tagJsType: ValueTypes.tag,
+        strings: strings,
+        key(arrayValue) {
+            tag.arrayValue = arrayValue;
+            return tag;
+        },
+        html: function html(strings, values) {
+            tag.children = { strings, values };
+            return tag;
+        }
+    };
+    return tag;
 }
-export class Dom extends BaseTag {
-    dom;
-    values;
-    tagJsType = ValueTypes.dom;
-    children;
-    constructor(dom, values) {
-        super(values);
-        this.dom = dom;
-        this.values = values;
-    }
-    html = {
-        // $this: this,
-        dom: (dom, ...values) => {
-            this.children = { dom, values };
-            return this;
+export function getDomTag(dom, values) {
+    const tag = {
+        values,
+        ownerSupport: getSupportInCycle(),
+        dom,
+        tagJsType: ValueTypes.dom,
+        key: function keyFun(arrayValue) {
+            tag.arrayValue = arrayValue;
+            return tag;
+        },
+        html: {
+            dom: function dom(dom, // ObjectChildren
+            values) {
+                tag.children = { dom: dom, values };
+                return tag;
+            }
         }
     };
+    return tag;
 }
 //# sourceMappingURL=Tag.class.js.map

package/js/tag/Tag.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tag.class.js","sourceRoot":"","sources":["../../ts/tag/Tag.class.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAOtB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKjD,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAA;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;AACjC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,GAAG,cAAc,GAAG,IAAI,CAAA;AAE1D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;AAiB3D,MAAM,OAAO,OAAO;IAST;IART,SAAS,CAAS;IAElB,qDAAqD;IACrD,UAAU,CAAU;IAEpB,SAAS,CAAkB;IAE3B,YACS,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;IACvB,CAAC;IAEJ,mFAAmF;IACnF,GAAG,CAAC,UAAmB;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,MAAM,OAAO,GAAI,SAAQ,OAAO;IAKrB;IACA;IALT,SAAS,GAAG,UAAU,CAAC,GAAG,CAAA;IAC1B,QAAQ,CAAgE;IAExE,YACS,OAAiB,EACjB,MAAiB;QAExB,KAAK,CAAC,MAAM,CAAC,CAAA;QAHN,YAAO,GAAP,OAAO,CAAU;QACjB,WAAM,GAAN,MAAM,CAAW;IAG1B,CAAC;IAED,IAAI,CACF,OAAwC,EACxC,GAAG,MAAiB;QAEpB,IAAI,CAAC,QAAQ,GAAG,EAAC,OAAO,EAAE,MAAM,EAAC,CAAA;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAED,MAAM,OAAO,GAAI,SAAQ,OAAO;IAKrB;IACA;IALT,SAAS,GAAG,UAAU,CAAC,GAAG,CAAA;IAC1B,QAAQ,CAA2C;IAEnD,YACS,GAAmB,EACnB,MAAiB;QAExB,KAAK,CAAC,MAAM,CAAC,CAAA;QAHN,QAAG,GAAH,GAAG,CAAgB;QACnB,WAAM,GAAN,MAAM,CAAW;IAG1B,CAAC;IAED,IAAI,GAAG;QACL,eAAe;QACf,GAAG,EAAE,CACH,GAAmB,EACnB,GAAG,MAAiB,EACf,EAAE;YACP,IAAI,CAAC,QAAQ,GAAG,EAAC,GAAG,EAAE,MAAM,EAAC,CAAA;YAC7B,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;CACF"}
+{"version":3,"file":"Tag.class.js","sourceRoot":"","sources":["../../ts/tag/Tag.class.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAOtB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAA;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAA;AA0CjC,MAAM,UAAU,YAAY,CAC1B,OAAiB,EACjB,MAAiB;IAEjB,MAAM,GAAG,GAAc;QACrB,MAAM;QACN,YAAY,EAAE,iBAAiB,EAAE;QAEjC,SAAS,EAAE,UAAU,CAAC,GAAG;QACzB,OAAO,EAAE,OAAO;QAChB,GAAG,CAAC,UAAmB;YACrB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;YAC3B,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,IAAI,EAAE,SAAS,IAAI,CACjB,OAAwC,EACxC,MAAiB;YAEjB,GAAG,CAAC,QAAQ,GAAG,EAAC,OAAO,EAAE,MAAM,EAAC,CAAA;YAChC,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AAmBD,MAAM,UAAU,SAAS,CACvB,GAAuB,EACvB,MAAiB;IAEjB,MAAM,GAAG,GAAW;QAClB,MAAM;QACN,YAAY,EAAE,iBAAiB,EAAE;QACjC,GAAG;QACH,SAAS,EAAE,UAAU,CAAC,GAAG;QACzB,GAAG,EAAE,SAAS,MAAM,CAAC,UAAmB;YACtC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;YAC3B,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,SAAS,GAAG,CACf,GAAuB,EAAE,iBAAiB;YAC1C,MAAiB;gBAEjB,GAAG,CAAC,QAAQ,GAAG,EAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAC,CAAA;gBACjC,OAAO,GAAG,CAAA;YACZ,CAAC;SACF;KACF,CAAA;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/js/tag/TemplaterResult.class.d.ts

@@ -1,58 +1,52 @@
-import { Context, Tag, Dom } from './Tag.class.js';
-import { BaseSupport, Support } from './Support.class.js';
+import { StringTag, DomTag, EventCallback } from './Tag.class.js';
+import { ContextItem } from './Context.types.js';
+import { BaseSupport, Support, SupportContextItem } from './Support.class.js';
 import { Props } from '../Props.js';
-import { TagChildren, TagWrapper } from './tag.utils.js';
+import { TagWrapper } from './tag.utils.js';
 import { Provider } from '../state/providers.js';
 import { OnDestroyCallback } from '../state/onDestroy.js';
-import { TagSubject } from '../subject.types.js';
 import { OnInitCallback } from '../state/onInit.js';
 import { Subscription } from '../subject/subject.utils.js';
-import { InsertBefore } from '../interpolations/InsertBefore.type.js';
-import { TagValues } from './html.js';
 import { Subject } from '../subject/index.js';
-import { ValueTypes } from './ValueTypes.enum.js';
-import { ObjectChildren } from '../interpolations/optimizers/ObjectNode.types.js';
-export type OriginalFunction = (() => Tag) & {
-    compareTo: string;
-};
-export type Wrapper = ((newSupport: BaseSupport | Support, subject: TagSubject, prevSupport?: BaseSupport | Support) => Support) & {
+import { ValueType, ValueTypes } from './ValueTypes.enum.js';
+import { DomObjectChildren } from '../interpolations/optimizers/ObjectNode.types.js';
+import { PropWatches } from './tag.js';
+export type Wrapper = ((newSupport: BaseSupport | Support, subject: ContextItem, prevSupport?: BaseSupport | Support) => Support) & {
+    tagJsType: typeof ValueTypes.tagComponent | typeof ValueTypes.renderOnce | typeof ValueTypes.templater;
     parentWrap: TagWrapper<any>;
 };
 export type TagGlobal = {
-    destroy$: Subject<any>;
-    oldest: BaseSupport | Support;
-    newest?: BaseSupport | Support;
-    context: Context;
-    providers: Provider[];
+    htmlDomMeta?: DomObjectChildren;
     /** Indicator of re-rending. Saves from double rending something already rendered */
     renderCount: number;
     deleted?: true;
     isApp?: boolean;
-    insertBefore?: InsertBefore;
-    placeholder?: Text;
-    subscriptions: Subscription<any>[];
+    subscriptions?: Subscription<any>[];
     destroyCallback?: OnDestroyCallback;
-    init?: OnInitCallback;
     locked?: true;
-    blocked: (BaseSupport | Support)[];
-    childTags: Support[];
-    clones: Clone[];
     callbackMaker?: true;
+    events?: Events;
+};
+export type SupportTagGlobal = TagGlobal & {
+    destroy$: Subject<any>;
+    blocked: (BaseSupport | Support)[];
+    oldest: BaseSupport | Support;
+    newest: BaseSupport | Support;
+    context: SupportContextItem[];
+    init?: OnInitCallback;
+    providers?: Provider[];
+};
+export type Events = {
+    [name: string]: EventCallback;
 };
 export type Clone = (Element | Text | ChildNode);
-export declare class TemplaterResult {
-    props: Props;
-    tagJsType: ValueTypes;
-    tagged: boolean;
+export type TemplaterResult = {
+    propWatch: PropWatches;
+    tagJsType: ValueType;
     wrapper?: Wrapper;
-    madeChildIntoSubject?: boolean;
-    tag?: Tag | Dom;
-    children: TagChildren;
+    tag?: StringTag | DomTag;
+    props?: Props;
     arrayValue?: unknown;
-    constructor(props: Props);
-    key(arrayValue: unknown): this;
-    /** children */
-    html(strings: string[] | TemplateStringsArray, ...values: TagValues): this;
-    /** children */
-    dom(strings: ObjectChildren, ...values: TagValues): this;
-}
+    key: (arrayValue: unknown) => TemplaterResult;
+};
+export declare function getTemplaterResult(propWatch: PropWatches, props?: Props): TemplaterResult;