taggedjs 2.8.44 → 3.0.2

package/js/tag/props/alterProp.function.d.ts

@@ -1,14 +1,16 @@
-import { AnySupport } from '../AnySupport.type.js';
+import { AnySupport } from '../index.js';
 import { TemplaterResult } from '../getTemplaterResult.function.js';
 import { Props } from '../../Props.js';
 import { UnknownFunction } from '../index.js';
-import { Subject } from '../../subject/Subject.class.js';
-export declare function castProps(props: Props, newSupport: AnySupport, depth: number): unknown[];
-export declare function checkProp(value: unknown | TemplaterResult | SubableProp | unknown[] | Record<string, unknown>, ownerSupport: AnySupport, newSupport: AnySupport, depth: number, owner?: any): unknown;
+import { Subscription } from '../../index.js';
+export declare function castProps(props: Props, newSupport: AnySupport, currentDepth: number): Props;
+export declare function checkProp(value: unknown | TemplaterResult | SubableProp | unknown[] | Record<string, unknown>, ownerSupport: AnySupport, newSupport: AnySupport, depth: number, pos: number, owner?: any): unknown;
+type SubablePropMeta = {
+    subscription: Subscription<any>;
+    restore: () => any;
+};
 type SubableProp = {
-    [name: string]: {
-        subscription: Subject<void>;
-    };
+    [name: string]: SubablePropMeta;
 };
 export type WrapRunner = (() => unknown) & {
     original: unknown;

package/js/tag/props/alterProp.function.js

@@ -1,25 +1,27 @@
-import { getSupportInCycle } from '../getSupportInCycle.function.js';
+import { getSupportInCycle } from '../cycles/getSupportInCycle.function.js';
 import { deepCompareDepth } from '../hasSupportChanged.function.js';
 import { isArray, isStaticTag } from '../../isInstance.js';
 import { BasicTypes } from '../ValueTypes.enum.js';
 import { setUseMemory } from '../../state/index.js';
 import { safeRenderSupport } from './safeRenderSupport.function.js';
-export function castProps(props, newSupport, depth) {
-    return props.map(function eachCastProp(prop) {
-        return alterProp(prop, newSupport.ownerSupport, newSupport, depth);
+export function castProps(props, newSupport, currentDepth) {
+    return props;
+    return props.map(function eachCastProp(prop, pos) {
+        return alterProp(prop, newSupport.ownerSupport, newSupport, currentDepth, pos);
     });
 }
 /* Used to rewrite props that are functions. When they are called it should cause parent rendering */
-function alterProp(prop, ownerSupport, newSupport, depth) {
+function alterProp(prop, ownerSupport, newSupport, depth, pos // arguments position
+) {
     if (isStaticTag(prop) || !prop) {
         return prop;
     }
     if (!ownerSupport) {
         return prop; // no one above me
     }
-    return checkProp(prop, ownerSupport, newSupport, depth);
+    return checkProp(prop, ownerSupport, newSupport, depth, pos);
 }
-export function checkProp(value, ownerSupport, newSupport, depth, owner) {
+export function checkProp(value, ownerSupport, newSupport, depth, pos, owner) {
     if (!value) {
         return value;
     }
@@ -41,28 +43,29 @@ export function checkProp(value, ownerSupport, newSupport, depth, owner) {
         return value; // no children to crawl through
     }
     if (isArray(value)) {
-        return checkArrayProp(value, newSupport, ownerSupport, depth);
+        return checkArrayProp(value, newSupport, ownerSupport, depth, pos);
     }
-    return checkObjectProp(value, newSupport, ownerSupport, depth);
+    return checkObjectProp(value, newSupport, ownerSupport, depth, pos);
 }
-function checkArrayProp(value, newSupport, ownerSupport, depth) {
+function checkArrayProp(value, newSupport, ownerSupport, depth, pos) {
     for (let index = value.length - 1; index >= 0; --index) {
         const subValue = value[index];
-        value[index] = checkProp(subValue, ownerSupport, newSupport, depth + 1, value);
+        value[index] = checkProp(subValue, ownerSupport, newSupport, depth + 1, pos, value);
         if (typeof (subValue) === BasicTypes.function) {
             if (subValue.mem) {
                 continue;
             }
-            afterCheckProp(depth + 1, index, subValue, value, newSupport);
+            afterCheckProp(depth + 1, index, subValue, value, newSupport, pos);
         }
     }
     return value;
 }
-function checkObjectProp(value, newSupport, ownerSupport, depth) {
+function checkObjectProp(value, newSupport, ownerSupport, depth, pos // argument position
+) {
     const keys = Object.keys(value);
     for (const name of keys) {
         const subValue = value[name];
-        const result = checkProp(subValue, ownerSupport, newSupport, depth + 1, value);
+        const result = checkProp(subValue, ownerSupport, newSupport, depth + 1, pos, value);
         const newSubValue = value[name];
         if (newSubValue === result) {
             continue;
@@ -77,19 +80,31 @@ function checkObjectProp(value, newSupport, ownerSupport, depth) {
             if (subValue.mem) {
                 continue;
             }
-            afterCheckProp(depth + 1, name, subValue, value, newSupport);
+            afterCheckProp(depth + 1, name, subValue, value, newSupport, pos);
         }
     }
     return value;
 }
-function afterCheckProp(depth, index, originalValue, newProp, newSupport) {
+function afterCheckProp(depth, index, originalValue, newProp, newSupport, pos) {
     // restore object to have original function on destroy
-    if (depth > 0) {
-        const global = newSupport.context.global;
-        newProp[index].subscription = global.destroy$.toCallback(function alterCheckProcessor() {
-            newProp[index] = originalValue;
-        });
+    if (depth <= 0) {
+        return;
     }
+    const context = newSupport.context;
+    const castedProps = context.value?.props;
+    if (castedProps) {
+        // check for old prop subscription
+        const prop = castedProps[pos][index];
+        if (prop?.subscription) {
+            prop.subscription(); // unsubscribe to prevent this old argument/prop from being called on destroy
+            prop.restore(); // put original value back
+        }
+    }
+    const altPropRestore = () => {
+        newProp[index] = originalValue;
+    };
+    newProp[index].subscription = newSupport.context.destroy$.toCallback(altPropRestore);
+    newProp[index].restore = altPropRestore;
 }
 export function getPropWrap(value, owner, ownerSupport) {
     const already = value.mem;
@@ -109,16 +124,28 @@ export function getPropWrap(value, owner, ownerSupport) {
 /** Function shared by alterProps() and updateExistingTagComponent... TODO: May want to have to functions to reduce cycle checking?  */
 export function callbackPropOwner(toCall, // original function
 owner, callWith, ownerSupport) {
-    const global = ownerSupport.context.global;
-    const newest = global?.newest || ownerSupport;
+    const ownerContext = ownerSupport.context;
+    const newest = ownerContext.state?.newest || ownerSupport;
     const supportInCycle = getSupportInCycle();
     const noCycle = supportInCycle === undefined;
     // actual function call to original method
     const callbackResult = toCall.apply(owner, callWith);
     const run = function propCallbackProcessor() {
-        const subject = newest.context;
-        const global = subject.global;
-        if (!global || subject.locked === true) {
+        const context = newest.context;
+        const global = context.global;
+        if (context.locked) {
+            return callbackResult; // currently in the middle of rendering
+        }
+        if (!global) {
+            /*
+            context.tagJsVar.processUpdate(
+              context.value,
+              context,
+              ownerSupport,
+              [],
+            )
+      */
+            ownerContext.tagJsVar.processUpdate(ownerContext.value, ownerContext, ownerSupport, []);
             return callbackResult; // currently in the middle of rendering
         }
         safeRenderSupport(newest);

package/js/tag/props/alterProp.function.js.map

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

package/js/tag/props/clonePropsBy.function.d.ts

@@ -1,5 +1,5 @@
 import { Props } from '../../Props.js';
-import { AnySupport } from '../AnySupport.type.js';
+import { AnySupport } from '../index.js';
 export declare function clonePropsBy(support: AnySupport, props: Props, castProps?: Props): {
     latest: Props;
     castProps: Props | undefined;

package/js/tag/props/safeRenderSupport.function.d.ts

@@ -1,2 +1,2 @@
-import { AnySupport } from '../AnySupport.type.js';
+import { AnySupport } from '../index.js';
 export declare function safeRenderSupport(newest: AnySupport): AnySupport;

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

@@ -0,0 +1,2 @@
+import { Props } from '../Props.js';
+export declare function shallowPropMatch(props: Props, pastCloneProps: Props): false | 3 | 3.1 | 3.3;

package/js/tag/shallowPropMatch.function.js

@@ -0,0 +1,44 @@
+import { isArray } from '../isInstance.js';
+import { BasicTypes } from './ValueTypes.enum.js';
+export function shallowPropMatch(props, pastCloneProps) {
+    // if every prop the same, then no changes
+    const len = props.length;
+    for (let index = 0; index < len; ++index) {
+        const prop = props[index];
+        const pastProp = pastCloneProps[index];
+        if (isArray(prop) && isArray(pastProp)) {
+            if (prop === pastProp) {
+                continue;
+            }
+            return 3.0; // not equal array
+        }
+        if (typeof (prop) === BasicTypes.function && typeof (pastProp) === BasicTypes.function) {
+            continue; // considered good
+        }
+        if (typeof (prop) === BasicTypes.object) {
+            if (typeof (pastCloneProps) === BasicTypes.object) {
+                const obEntries = Object.entries(prop);
+                for (const subItem of obEntries) {
+                    const result = objectItemMatches(subItem, pastProp);
+                    if (!result) {
+                        return 3.1;
+                    }
+                }
+            }
+            continue; // all sub objects matched
+        }
+        if (prop === pastProp) {
+            continue; // matched good
+        }
+        return 3.3; // not equal
+    }
+    return false; // false means has not changed
+}
+function objectItemMatches([name, value], pastProp) {
+    const pastValue = pastProp[name];
+    if (typeof (value) === BasicTypes.function && typeof (pastValue) === BasicTypes.function) {
+        return true;
+    }
+    return pastValue === value;
+}
+//# sourceMappingURL=shallowPropMatch.function.js.map

package/js/tag/shallowPropMatch.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shallowPropMatch.function.js","sourceRoot":"","sources":["../../ts/tag/shallowPropMatch.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,UAAU,gBAAgB,CAC9B,KAAY,EACZ,cAAqB;IAErB,0CAA0C;IAC1C,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAA;IACxB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;QACzB,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;QAEtC,IAAG,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,IAAG,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrB,SAAQ;YACV,CAAC;YAED,OAAO,GAAG,CAAA,CAAC,kBAAkB;QAC/B,CAAC;QAED,IAAG,OAAM,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,QAAQ,IAAI,OAAM,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YACpF,SAAQ,CAAC,kBAAkB;QAC7B,CAAC;QAED,IAAG,OAAM,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACtC,IAAG,OAAM,CAAC,cAAc,CAAC,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;gBAChD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACtC,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;oBAChC,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;oBACnD,IAAG,CAAC,MAAM,EAAE,CAAC;wBACX,OAAO,GAAG,CAAA;oBACZ,CAAC;gBACH,CAAC;YAEH,CAAC;YAED,SAAQ,CAAC,0BAA0B;QACrC,CAAC;QAED,IAAG,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrB,SAAQ,CAAC,eAAe;QAC1B,CAAC;QAED,OAAO,GAAG,CAAA,CAAC,YAAY;IACzB,CAAC;IAED,OAAO,KAAK,CAAA,CAAC,8BAA8B;AAC7C,CAAC;AAED,SAAS,iBAAiB,CACxB,CAAC,IAAI,EAAE,KAAK,CAAoB,EAChC,QAAa;IAEb,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEhC,IAAG,OAAM,CAAC,KAAK,CAAC,KAAK,UAAU,CAAC,QAAQ,IAAI,OAAM,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,SAAS,KAAK,KAAK,CAAA;AAC5B,CAAC"}

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

@@ -1,3 +1,5 @@
-import { SupportTagGlobal } from './getTemplaterResult.function.js';
+import { ContextItem } from './ContextItem.type.js';
+import { SupportContextItem } from './index.js';
 /** sets global.deleted on support and all children */
-export declare function smartRemoveKids(global: SupportTagGlobal, allPromises: Promise<any>[]): void;
+export declare function smartRemoveKids(context: SupportContextItem, allPromises: Promise<any>[]): void;
+export declare function destroyContextHtml(context: ContextItem): void;

package/js/tag/smartRemoveKids.function.js

@@ -1,70 +1,51 @@
-import { destroyArray } from './checkDestroyPrevious.function.js';
+import { destroyArray } from './destroyArrayContext.function.js';
 import { addPaintRemover } from '../render/paint.function.js';
+import { destroyHtmlDomMeta } from './destroyHtmlDomMeta.function.js';
+import { isPromise } from '../index.js';
 /** sets global.deleted on support and all children */
-export function smartRemoveKids(global, allPromises) {
-    const context = global.contexts;
-    smartRemoveByContext(context, allPromises);
-    destroyClones(global);
+export function smartRemoveKids(context, allPromises) {
+    const subContexts = context.contexts;
+    smartRemoveByContext(subContexts, allPromises);
+    destroyContextHtml(context);
 }
-function smartRemoveByContext(context, allPromises) {
-    for (const subject of context) {
-        if (subject.locked) {
-            continue;
-        }
-        if (subject.withinOwnerElement) {
-            const tagJsVar = subject.tagJsVar;
+export function destroyContextHtml(context) {
+    destroyHtmlDomMeta(context.htmlDomMeta);
+}
+function smartRemoveByContext(contexts, allPromises) {
+    for (const context of contexts) {
+        if (context.withinOwnerElement) {
+            const tagJsVar = context.tagJsVar;
             if (tagJsVar && tagJsVar.tagJsType === 'host') {
-                const newest = subject.supportOwner;
-                tagJsVar.delete(subject, newest);
+                const newest = context.supportOwner;
+                const hostDestroy = tagJsVar.destroy(context, newest);
+                if (isPromise(hostDestroy)) {
+                    allPromises.push(hostDestroy);
+                }
             }
             continue; // i live within my owner variable. I will be deleted with owner
         }
-        const lastArray = subject.lastArray;
+        const lastArray = context.lastArray;
         if (lastArray) {
-            destroyArray(subject, lastArray);
+            destroyArray(context, lastArray);
             continue;
         }
         // regular values, no placeholders
-        const elm = subject.simpleValueElm;
+        const elm = context.simpleValueElm;
         if (elm) {
-            delete subject.simpleValueElm;
-            addPaintRemover(elm);
+            delete context.simpleValueElm;
+            addPaintRemover(elm, 'smartRemoveByContext');
             continue;
         }
-        const subGlobal = subject.global;
+        const subGlobal = context.global;
         if (subGlobal === undefined) {
-            continue; // subject
-        }
-        if (subGlobal.deleted === true) {
-            continue; // already deleted
+            continue; // context
         }
         subGlobal.deleted = true;
-        const oldest = subGlobal.oldest;
+        const oldest = context.state?.oldest;
         if (oldest) {
-            smartRemoveKids(subGlobal, allPromises);
+            smartRemoveKids(context, allPromises);
             continue;
         }
     }
 }
-/** Destroy dom elements and dom space markers */
-function destroyClones(global) {
-    const htmlDomMeta = global.htmlDomMeta;
-    // check subjects that may have clones attached to them
-    for (let index = htmlDomMeta.length - 1; index >= 0; --index) {
-        const clone = htmlDomMeta[index];
-        destroyClone(clone);
-        htmlDomMeta.splice(index, 1);
-    }
-}
-function destroyClone(clone) {
-    const marker = clone.marker;
-    if (marker) {
-        addPaintRemover(marker);
-    }
-    const dom = clone.domElement;
-    if (!dom) {
-        return;
-    }
-    addPaintRemover(dom);
-}
 //# sourceMappingURL=smartRemoveKids.function.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"smartRemoveKids.function.js","sourceRoot":"","sources":["../../ts/tag/smartRemoveKids.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAM7D,sDAAsD;AACtD,MAAM,UAAU,eAAe,CAC7B,MAAwB,EACxB,WAA2B;IAE3B,MAAM,OAAO,GAAG,MAAM,CAAC,QAAyB,CAAA;IAEhD,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IAC1C,aAAa,CAAC,MAAM,CAAC,CAAA;AACvB,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAsB,EACtB,WAA2B;IAE3B,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;QAC9B,IAAI,OAAO,CAAC,MAAM,EAAG,CAAC;YACpB,SAAQ;QACV,CAAC;QAED,IAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAoB,CAAA;YAC7C,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,EAAG,CAAC;gBAC/C,MAAM,MAAM,GAAI,OAAe,CAAC,YAA0B,CAAA;gBAC1D,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YAClC,CAAC;YAED,SAAQ,CAAC,gEAAgE;QAC3E,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QACnC,IAAG,SAAS,EAAE,CAAC;YACb,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAsB,CAAA;QAC1C,IAAG,GAAG,EAAE,CAAC;YACP,OAAO,OAAO,CAAC,cAAc,CAAA;YAC7B,eAAe,CAAC,GAAG,CAAC,CAAA;YACpB,SAAQ;QACV,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,MAA0B,CAAA;QACpD,IAAG,SAAS,KAAK,SAAS,EAAE,CAAC;YAC3B,SAAQ,CAAC,UAAU;QACrB,CAAC;QAED,IAAG,SAAS,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC9B,SAAQ,CAAC,kBAAkB;QAC7B,CAAC;QAED,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;QAC/B,IAAG,MAAM,EAAE,CAAC;YACV,eAAe,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;YACvC,SAAQ;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,SAAS,aAAa,CACpB,MAAwB;IAExB,MAAM,WAAW,GAAG,MAAM,CAAC,WAAgC,CAAA;IAE3D,uDAAuD;IACvD,KAAK,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC9D,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QAC/B,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CACnB,KAAuC;IAErC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;IAC3B,IAAG,MAAM,EAAE,CAAC;QACV,eAAe,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAA;IAC5B,IAAG,CAAC,GAAG,EAAE,CAAC;QACR,OAAM;IACR,CAAC;IAED,eAAe,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC"}
+{"version":3,"file":"smartRemoveKids.function.js","sourceRoot":"","sources":["../../ts/tag/smartRemoveKids.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAK7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,sDAAsD;AACtD,MAAM,UAAU,eAAe,CAC7B,OAA2B,EAC3B,WAA2B;IAE3B,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAA;IAEpC,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;IAC9C,kBAAkB,CAAC,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAoB;IACrD,kBAAkB,CAAC,OAAO,CAAC,WAAgC,CAAC,CAAA;AAC9D,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAuB,EACvB,WAA2B;IAE3B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAoB,CAAA;YAE7C,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,EAAG,CAAC;gBAC/C,MAAM,MAAM,GAAI,OAAe,CAAC,YAA0B,CAAA;gBAC1D,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAErD,IAAI,SAAS,CAAC,WAAW,CAAC,EAAG,CAAC;oBAC5B,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC/B,CAAC;YACH,CAAC;YAED,SAAQ,CAAC,gEAAgE;QAC3E,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QACnC,IAAG,SAAS,EAAE,CAAC;YACb,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;YAChC,SAAQ;QACV,CAAC;QAED,kCAAkC;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAsB,CAAA;QAC1C,IAAG,GAAG,EAAE,CAAC;YACP,OAAO,OAAO,CAAC,cAAc,CAAA;YAC7B,eAAe,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAA;YAC5C,SAAQ;QACV,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,MAA0B,CAAA;QACpD,IAAG,SAAS,KAAK,SAAS,EAAE,CAAC;YAC3B,SAAQ,CAAC,UAAU;QACrB,CAAC;QAED,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;QACxB,MAAM,MAAM,GAAI,OAA8B,CAAC,KAAK,EAAE,MAAM,CAAA;QAC5D,IAAG,MAAM,EAAE,CAAC;YACV,eAAe,CAAC,OAA6B,EAAE,WAAW,CAAC,CAAA;YAC3D,SAAQ;QACV,CAAC;IACH,CAAC;AACH,CAAC"}

package/js/tag/tag.types.d.ts

@@ -1,5 +1,8 @@
+import { ElementVar } from '../elements/designElement.function.js';
 import { ValueSubject } from '../subject/index.js';
+import { ReadOnlyVar } from '../tagJsVars/tagJsVar.type.js';
 import { AnyTag } from './AnyTag.type.js';
+import { ContextItem } from './ContextItem.type.js';
 export declare class RouteQuery {
     get(_name: string): string | undefined;
 }
@@ -8,8 +11,9 @@ export type RouteProps = {
     paramSubject: ValueSubject<string>;
     query: RouteQuery;
 };
-export type ToTag = ((...props: any[]) => StateToTag | AnyTag | null) & {
-    arrayValue?: unknown;
-};
-export type StateToTag = () => AnyTag | null;
+type TagResponse = ReadOnlyVar | StateToTag | AnyTag | null | number | string | ElementVar | (() => any);
+export type SimpleToTag = ((...props: any[]) => TagResponse | (TagResponse | ((_contextItem: ContextItem) => any))[]);
+export type ToTag = SimpleToTag | (() => SimpleToTag);
+export type StateToTag = () => ElementVar | AnyTag | null;
 export type RouteTag = (extraProps?: Record<string, any>) => AnyTag;
+export {};

package/js/tag/tag.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.types.js","sourceRoot":"","sources":["../../ts/tag/tag.types.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,UAAU;IACrB,GAAG,CAAC,KAAa;QACf,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"tag.types.js","sourceRoot":"","sources":["../../ts/tag/tag.types.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,UAAU;IACrB,GAAG,CAAC,KAAa;QACf,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/js/tag/tagElement.d.ts

@@ -1,9 +1,8 @@
 import { TagWrapper } from './tag.utils.js';
 import { ValueTypes } from './ValueTypes.enum.js';
 import { TagMaker } from './TagMaker.type.js';
-import { BaseSupport } from './BaseSupport.type.js';
 import { setUseMemory } from '../state/setUseMemory.object.js';
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
 export type TagAppElement = Element & {
     ValueTypes: typeof ValueTypes;
     setUse: typeof setUseMemory;
@@ -19,8 +18,9 @@ export declare const appElements: {
  * @param props object
  * @returns
  */
-export declare function tagElement(app: TagMaker, element: HTMLElement | Element, props?: unknown): {
-    support: BaseSupport;
+export declare function tagElement(app: TagMaker, element: HTMLElement | Element, // aka appElement
+props?: unknown): {
+    support: AnySupport;
     tags: TagWrapper<unknown>[];
     ValueTypes: typeof ValueTypes;
 };

package/js/tag/tagElement.js

@@ -4,10 +4,15 @@ import { destroySupport } from '../render/destroySupport.function.js';
 import { PropWatches } from './index.js';
 import { initState } from '../state/state.utils.js';
 import { isTagComponent } from '../isInstance.js';
-import { checkTagValueChange, destroySupportByContextItem } from './checkTagValueChange.function.js';
+import { checkTagValueChangeAndUpdate } from './checkTagValueChange.function.js';
+import { destroySupportByContextItem } from './destroySupportByContextItem.function.js';
 import { renderTagElement } from '../render/renderTagElement.function.js';
 import { loadNewBaseSupport } from './loadNewBaseSupport.function.js';
 import { tagValueUpdateHandler } from './update/tagValueUpdateHandler.function.js';
+import { blankHandler } from '../render/dom/blankHandler.function.js';
+import { setSupportInCycle } from './cycles/getSupportInCycle.function.js';
+import { Subject } from '../subject/Subject.class.js';
+import { removeContextInCycle } from './cycles/setContextInCycle.function.js';
 if (typeof (document) === 'object') {
     if (document.taggedJs) {
         console.warn('🏷️🏷️ Multiple versions of taggedjs are loaded. May cause issues.');
@@ -22,7 +27,8 @@ export const appElements = [];
  * @param props object
  * @returns
  */
-export function tagElement(app, element, props) {
+export function tagElement(app, element, // aka appElement
+props) {
     const appElmIndex = appElements.findIndex(appElm => appElm.element === element);
     if (appElmIndex >= 0) {
         const support = appElements[appElmIndex].support;
@@ -42,7 +48,9 @@ export function tagElement(app, element, props) {
     // create observable the app lives on
     const subject = getNewSubject(templater, element);
     const global = subject.global;
-    initState(global.newest);
+    const newest = subject.state.newest;
+    initState(newest.context);
+    setSupportInCycle(newest);
     let templater2 = app(props);
     const isAppFunction = typeof templater2 == BasicTypes.function;
     if (!isAppFunction) {
@@ -51,7 +59,7 @@ export function tagElement(app, element, props) {
             templater2 = app;
         }
         else {
-            global.newest.propsConfig = {
+            subject.state.newest.propsConfig = {
                 latest: [props],
                 castProps: [props],
             };
@@ -61,32 +69,41 @@ export function tagElement(app, element, props) {
             templater = templater2;
         }
     }
-    return renderTagElement(app, global, templater, templater2, element, subject, isAppFunction);
+    const result = renderTagElement(app, global, templater, templater2, element, subject, isAppFunction);
+    removeContextInCycle();
+    return result;
 }
 function getNewSubject(templater, appElement) {
     const tagJsVar = {
         tagJsType: 'templater',
-        checkValueChange: checkTagValueChange,
-        delete: destroySupportByContextItem,
+        hasValueChanged: checkTagValueChangeAndUpdate,
+        destroy: destroySupportByContextItem,
+        processInitAttribute: blankHandler,
         processInit: function appDoNothing() {
             console.debug('do nothing app function');
         },
         processUpdate: tagValueUpdateHandler,
     };
-    const subject = {
+    const context = {
+        updateCount: 0,
         value: templater,
         valueIndex: 0,
-        valueIndexSetBy: 'getNewSubject',
+        varCounter: 0,
+        destroy$: new Subject(),
+        render$: new Subject(),
         withinOwnerElement: false, // i am the highest owner
         renderCount: 0,
         global: undefined, // gets set below in getNewGlobal()
+        state: {},
+        // parentContext: undefined as any,
         tagJsVar,
     };
-    const global = getNewGlobal(subject);
+    // sets new global on context
+    getNewGlobal(context);
     // TODO: events are only needed on the base and not every support
     // for click events and such read at a higher level
-    global.events = {};
-    loadNewBaseSupport(templater, subject, appElement);
-    return subject;
+    context.events = {};
+    loadNewBaseSupport(templater, context, appElement);
+    return context;
 }
 //# sourceMappingURL=tagElement.js.map

package/js/tag/tagElement.js.map

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

package/js/tag/tagRunner.d.ts

@@ -1,3 +1,3 @@
 import { SupportTagGlobal } from './getTemplaterResult.function.js';
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
 export declare function runBeforeDestroy(support: AnySupport, global: SupportTagGlobal): void;

package/js/tag/tagRunner.js

@@ -1,6 +1,6 @@
 // Life cycle 4 - end of life
 export function runBeforeDestroy(support, global) {
-    const providers = global.providers;
+    const providers = support.context.providers;
     if (providers) {
         for (const provider of providers) {
             for (let index = provider.children.length - 1; index >= 0; --index) {
@@ -11,9 +11,8 @@ export function runBeforeDestroy(support, global) {
             }
         }
     }
-    if (global.destroy$) {
-        global.destroy$.next();
-    }
+    // global.deleted = true
+    support.context.destroy$.next();
     support.context.renderCount = 0; // if it comes back, wont be considered an update
 }
 //# sourceMappingURL=tagRunner.js.map

package/js/tag/tagRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"tagRunner.js","sourceRoot":"","sources":["../../ts/tag/tagRunner.ts"],"names":[],"mappings":"AAGA,6BAA6B;AAC7B,MAAM,UAAU,gBAAgB,CAC9B,OAAmB,EACnB,MAAwB;IAExB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IAClC,IAAG,SAAS,EAAE,CAAC;QACb,KAAI,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAChC,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;gBACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACtC,IAAG,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACnC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAA,CAAC,iDAAiD;AACnF,CAAC"}
+{"version":3,"file":"tagRunner.js","sourceRoot":"","sources":["../../ts/tag/tagRunner.ts"],"names":[],"mappings":"AAGA,6BAA6B;AAC7B,MAAM,UAAU,gBAAgB,CAC9B,OAAmB,EACnB,MAAwB;IAExB,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAA;IAE3C,IAAG,SAAS,EAAE,CAAC;QACb,KAAI,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAChC,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;gBACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACtC,IAAG,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACnC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,wBAAwB;IACxB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/B,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAA,CAAC,iDAAiD;AACnF,CAAC"}

package/js/tag/update/SubContext.type.d.ts

@@ -1,18 +1,28 @@
-import { AdvancedContextItem, TemplateValue } from "../../index.js";
-import { SubscribeCallback } from "../../tagJsVars/subscribe.function.js";
-import { LikeSubscription } from '../../tagJsVars/subscribe.function.js';
+import { ContextItem, TemplateValue } from "../../index.js";
+import { LikeSubscription } from "../../tagJsVars/processSubscribeWithAttribute.function.js";
+import { SubscribeValue } from '../../tagJsVars/subscribe.function.js';
+import { TagJsVar } from "../../tagJsVars/tagJsVar.type.js";
 export interface SubContext {
+    tagJsVar?: TagJsVar;
     hasEmitted?: true;
     deleted?: true;
     /** Handles each emission separately */
-    valueHandler: (value: TemplateValue, index: number) => void;
+    subValueHandler: (value: TemplateValue, index: number) => void;
     /** Handles all emissions collectively */
-    valuesHandler: (values: TemplateValue[]) => void;
-    lastValues: any[];
+    valuesHandler: (values: {
+        value: TemplateValue;
+        tagJsVar: TagJsVar;
+    }[], index: number) => void;
+    lastValues: {
+        value: TemplateValue;
+        tagJsVar: TagJsVar;
+        oldTagJsVar?: TagJsVar;
+    }[];
     appendMarker?: Text;
-    contextItem?: AdvancedContextItem;
+    contextItem?: ContextItem;
 }
+export type OnSubOutput = (value: TemplateValue, syncRun: boolean, subContext: SubscriptionContext) => any;
 export interface SubscriptionContext extends SubContext {
-    callback?: SubscribeCallback<any>;
+    tagJsVar: SubscribeValue;
     subscriptions: LikeSubscription[];
 }