taggedjs 2.5.23 → 2.6.1

package/js/render.js

@@ -5,14 +5,27 @@ export function buildClones(temporary, insertBefore) {
     const fragment = document.createDocumentFragment();
     while (nextSibling) {
         const nextNextSibling = nextSibling.nextSibling;
-        clones.push(nextSibling);
         fragment.appendChild(nextSibling);
+        // ??? new
+        /*
+        if(nextSibling.nodeName === 'TEMPLATE') {
+          const hasAttribute = (nextSibling as any).hasAttribute
+          if(hasAttribute && (nextSibling as any).hasAttribute('interpolate')) {
+            nextSibling = nextNextSibling
+            continue // we don't record position keepers
+          }
+        }
+        */
+        clones.push(nextSibling);
         nextSibling = nextNextSibling;
     }
-    if (insertBefore.parentNode) {
-        const parentNode = insertBefore.parentNode;
-        parentNode.insertBefore(fragment, insertBefore);
+    // swap out our template for an empty-string placeholder
+    /*
+    if(insertBefore.parentNode) {
+      const parentNode = insertBefore.parentNode as ParentNode
+      parentNode.insertBefore(fragment, insertBefore)
     }
+    */
     return clones;
 }
 //# sourceMappingURL=render.js.map

package/js/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../ts/render.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CACzB,SAA2B,EAC3B,YAA0B;IAE1B,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;IAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAA;IAElD,OAAO,WAAW,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,WAAW,CAAC,WAAwB,CAAA;QAC5D,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxB,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QACjC,WAAW,GAAG,eAAe,CAAA;IAC/B,CAAC;IAED,IAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,YAAY,CAAC,UAAwB,CAAA;QACxD,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACjD,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../ts/render.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CACzB,SAA2B,EAC3B,YAA0B;IAE1B,MAAM,MAAM,GAAgB,EAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAA;IAC7D,IAAI,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAA;IAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAA;IAElD,OAAO,WAAW,EAAE,CAAC;QACnB,MAAM,eAAe,GAAG,WAAW,CAAC,WAAwB,CAAA;QAC5D,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;QAEjC,UAAU;QACV;;;;;;;;UAQE;QAEF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACxB,WAAW,GAAG,eAAe,CAAA;IAC/B,CAAC;IAED,wDAAwD;IACxD;;;;;MAKE;IAEF,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/state/callbackMaker.function.d.ts

@@ -1,4 +1,4 @@
 export type Callback<A, B, C, D, E, F, T> = (a: A, b: B, c: C, d: D, e: E, f: F) => T;
 export declare const callbackMaker: () => <A, B, C, D, E, F, T>(callback: Callback<A, B, C, D, E, F, T>) => (a?: A | undefined, b?: B | undefined, c?: C | undefined, d?: D | undefined, e?: E | undefined, f?: F | undefined) => T;
 /** Wrap a function that will be called back. After the wrapper and function are called, a rendering cycle will update display */
-export declare function callback<A, B, C, D, E, F, T>(callback: Callback<A, B, C, D, E, F, T>): () => T;
+export declare function callback<A, B, C, D, E, F, T>(callback: Callback<A, B, C, D, E, F, T>): (A?: A, B?: B, C?: C, D?: D, E?: E, F?: F) => T;

package/js/state/callbackMaker.function.js

@@ -1,49 +1,39 @@
-import { setUse } from './setUse.function.js';
+import { setUseMemory } from './setUse.function.js';
 import { SyncCallbackError } from '../errors.js';
 import { getSupportInCycle } from '../tag/getSupportInCycle.function.js';
 import callbackStateUpdate from './callbackStateUpdate.function.js';
 let innerCallback = (callback) => (a, b, c, d, e, f) => {
     throw new SyncCallbackError('Callback function was called immediately in sync and must instead be call async');
 };
-export const callbackMaker = () => innerCallback;
-const originalGetter = innerCallback; // callbackMaker
-setUse({
-    beforeRender: tagSupport => initMemory(tagSupport),
-    beforeRedraw: tagSupport => initMemory(tagSupport),
-    afterRender: tagSupport => {
-        ;
-        tagSupport.global.callbackMaker = true;
-        innerCallback = originalGetter; // prevent crossing callbacks with another tag
-    },
-});
+export const callbackMaker = () => {
+    const support = getSupportInCycle();
+    // callback as typeof innerCallback
+    if (!support) {
+        throw syncError;
+    }
+    const oldState = setUseMemory.stateConfig.array;
+    return function triggerMaker(callback) {
+        return createTrigger(support, oldState, callback);
+    };
+};
+const syncError = new SyncCallbackError('callback() was called outside of synchronous rendering. Use `callback = callbackMaker()` to create a callback that could be called out of sync with rendering');
 /** Wrap a function that will be called back. After the wrapper and function are called, a rendering cycle will update display */
 export function callback(callback) {
-    const tagSupport = getSupportInCycle();
-    if (!tagSupport) {
-        const error = new SyncCallbackError('callback() was called outside of synchronous rendering. Use `callback = callbackMaker()` to create a callback that could be called out of sync with rendering');
-        throw error;
+    const support = getSupportInCycle();
+    if (!support) {
+        throw syncError;
     }
-    const oldState = setUse.memory.stateConfig.array;
-    const trigger = (...args) => {
-        const callbackMaker = tagSupport.global.callbackMaker;
+    return createTrigger(support, setUseMemory.stateConfig.array, callback);
+}
+function createTrigger(support, oldState, toCallback) {
+    return function trigger(...args) {
+        const global = support.subject.global;
+        const callbackMaker = global.renderCount > 0;
         if (callbackMaker) {
-            return callbackStateUpdate(tagSupport, callback, oldState, ...args);
+            return callbackStateUpdate(support, toCallback, oldState, ...args);
         }
-        return callback(...args);
-    };
-    return trigger;
-}
-function initMemory(tagSupport) {
-    const oldState = setUse.memory.stateConfig.array;
-    innerCallback = (callback) => {
-        const trigger = (...args) => {
-            const callbackMaker = tagSupport.global.callbackMaker;
-            if (callbackMaker) {
-                return callbackStateUpdate(tagSupport, callback, oldState, ...args);
-            }
-            return callback(...args);
-        };
-        return trigger;
+        // we are in sync with rendering, just run callback naturally
+        return toCallback(...args);
     };
 }
 //# sourceMappingURL=callbackMaker.function.js.map

package/js/state/callbackMaker.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"callbackMaker.function.js","sourceRoot":"","sources":["../../ts/state/callbackMaker.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,mBAAmB,MAAM,mCAAmC,CAAA;AAOnE,IAAI,aAAa,GAAG,CAClB,QAAiC,EACjC,EAAE,CAAC,CAAC,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAK,EAAE;IAC7C,MAAM,IAAI,iBAAiB,CAAC,iFAAiF,CAAC,CAAA;AAChH,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,aAAa,CAAA;AAEhD,MAAM,cAAc,GAAG,aAAa,CAAA,CAAC,gBAAgB;AAErD,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAClD,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAClD,WAAW,EAAE,UAAU,CAAC,EAAE;QACxB,CAAC;QAAC,UAAU,CAAC,MAAc,CAAC,aAAa,GAAG,IAAI,CAAA;QAChD,aAAa,GAAG,cAAc,CAAA,CAAC,8CAA8C;IAC/E,CAAC;CACF,CAAC,CAAA;AAEF,iIAAiI;AACjI,MAAM,UAAU,QAAQ,CACtB,QAAuC;IAEvC,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAA;IAEtC,IAAG,CAAC,UAAU,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAAC,+JAA+J,CAAC,CAAA;QACpM,MAAM,KAAK,CAAA;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAA;IAChD,MAAM,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QACjC,MAAM,aAAa,GAAI,UAAU,CAAC,MAAc,CAAC,aAAa,CAAA;QAE9D,IAAG,aAAa,EAAE,CAAC;YACjB,OAAO,mBAAmB,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAA;QACrE,CAAC;QAED,OAAQ,QAAgB,CAAC,GAAG,IAAI,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,UAAU,CAAE,UAAuC;IAC1D,MAAM,QAAQ,GAAU,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAA;IACvD,aAAa,GAAG,CACd,QAAqD,EACrD,EAAE;QACF,MAAM,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YACjC,MAAM,aAAa,GAAI,UAAU,CAAC,MAAc,CAAC,aAAa,CAAA;YAE9D,IAAG,aAAa,EAAE,CAAC;gBACjB,OAAO,mBAAmB,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAA;YACrE,CAAC;YAED,OAAQ,QAAgB,CAAC,GAAG,IAAI,CAAC,CAAA;QACnC,CAAC,CAAA;QAED,OAAO,OAAO,CAAA;IAChB,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"callbackMaker.function.js","sourceRoot":"","sources":["../../ts/state/callbackMaker.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,mBAAmB,MAAM,mCAAmC,CAAA;AAUnE,IAAI,aAAa,GAAG,CAClB,QAAiC,EACjC,EAAE,CAAC,CAAC,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAE,CAAI,EAAK,EAAE;IAC7C,MAAM,IAAI,iBAAiB,CAAC,iFAAiF,CAAC,CAAA;AAChH,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;IACnC,mCAAmC;IAEnC,IAAG,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,SAAS,CAAA;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,CAAA;IAC/C,OAAO,SAAS,YAAY,CAC1B,QAAuC;QAEvC,OAAO,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACnD,CAAyB,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,IAAI,iBAAiB,CAAC,+JAA+J,CAAC,CAAA;AAExM,iIAAiI;AACjI,MAAM,UAAU,QAAQ,CACtB,QAAuC;IAEvC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAA;IAEnC,IAAG,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,SAAS,CAAA;IACjB,CAAC;IAED,OAAO,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;AACzE,CAAC;AAED,SAAS,aAAa,CACpB,OAAmB,EACnB,QAAe,EACf,UAAyC;IAEzC,OAAO,SAAS,OAAO,CAAC,GAAG,IAAW;QACpC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAmB,CAAA;QAClD,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,CAAA;QAE5C,IAAG,aAAa,EAAE,CAAC;YACjB,OAAO,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAA;QACpE,CAAC;QAED,6DAA6D;QAC7D,OAAQ,UAAkB,CAAC,GAAG,IAAI,CAAC,CAAA;IACrC,CAAC,CAAA;AACH,CAAC"}

package/js/state/callbackStateUpdate.function.d.ts

@@ -1,4 +1,4 @@
-import { BaseTagSupport, TagSupport } from '../tag/TagSupport.class.js';
-import { State } from './state.utils.js';
+import { BaseSupport, Support } from '../tag/Support.class.js';
+import { State } from './state.types.js';
 import { Callback } from './callbackMaker.function.js';
-export default function callbackStateUpdate<T>(tagSupport: TagSupport | BaseTagSupport, callback: Callback<any, any, any, any, any, any, T>, oldState: State, ...args: any[]): T;
+export default function callbackStateUpdate<T>(support: Support | BaseSupport, callback: Callback<any, any, any, any, any, any, T>, oldState: State, ...args: any[]): T;

package/js/state/callbackStateUpdate.function.js

@@ -1,21 +1,22 @@
-import { renderTagSupport } from '../tag/render/renderTagSupport.function.js';
+import { renderSupport } from '../tag/render/renderSupport.function.js';
 import { syncStates } from './syncStates.function.js';
-export default function callbackStateUpdate(tagSupport, callback, oldState, ...args) {
-    const state = tagSupport.memory.state;
+import { isPromise } from '../isInstance.js';
+export default function callbackStateUpdate(support, callback, oldState, ...args) {
+    const global = support.subject.global;
+    support = global.newest; // || support
+    const state = support.state;
     // ensure that the oldest has the latest values first
     syncStates(state, oldState);
     // run the callback
     const maybePromise = callback(...args);
     // send the oldest state changes into the newest
     syncStates(oldState, state);
-    renderTagSupport(tagSupport, // tagSupport.global.newest as TagSupport,
-    false);
-    if (maybePromise instanceof Promise) {
+    renderSupport(support);
+    if (isPromise(maybePromise)) {
         maybePromise.finally(() => {
             // send the oldest state changes into the newest
             syncStates(oldState, state);
-            renderTagSupport(tagSupport, // tagSupport.global.newest as TagSupport,
-            false);
+            renderSupport(support);
         });
     }
     // return undefined as T

package/js/state/callbackStateUpdate.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"callbackStateUpdate.function.js","sourceRoot":"","sources":["../../ts/state/callbackStateUpdate.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAGrD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,UAAuC,EACvC,QAAkD,EAClD,QAAe,EACf,GAAG,IAAW;IAEd,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAA;IAErC,qDAAqD;IACrD,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAE3B,mBAAmB;IACnB,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAiC,CAAC,CAAA;IAEnE,gDAAgD;IAChD,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC3B,gBAAgB,CACd,UAAU,EAAE,0CAA0C;IACtD,KAAK,CACN,CAAA;IAED,IAAG,YAAY,YAAY,OAAO,EAAE,CAAC;QACnC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE;YACxB,gDAAgD;YAChD,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YAE3B,gBAAgB,CACd,UAAU,EAAE,0CAA0C;YACtD,KAAK,CACN,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,wBAAwB;IACxB,OAAO,YAAY,CAAA;AACrB,CAAC"}
+{"version":3,"file":"callbackStateUpdate.function.js","sourceRoot":"","sources":["../../ts/state/callbackStateUpdate.function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAE5C,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,OAA8B,EAC9B,QAAkD,EAClD,QAAe,EACf,GAAG,IAAW;IAEd,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAA0B,CAAA;IACzD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAA,CAAC,aAAa;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAC3B,qDAAqD;IACrD,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAE3B,mBAAmB;IACnB,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,IAAiC,CAAC,CAAA;IAEnE,gDAAgD;IAChD,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC3B,aAAa,CAAC,OAAO,CAAC,CAAA;IAEtB,IAAG,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1B,YAA6B,CAAC,OAAO,CAAC,GAAG,EAAE;YAC1C,gDAAgD;YAChD,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;YAE3B,aAAa,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,wBAAwB;IACxB,OAAO,YAAY,CAAA;AACrB,CAAC"}

package/js/state/children.js

@@ -1,14 +1,14 @@
 import { setUse } from './setUse.function.js';
-function setCurrentTagSupport(support) {
+function setCurrentSupport(support) {
     setUse.memory.childrenCurrentSupport = support;
 }
 export function children() {
-    const tagSupport = setUse.memory.childrenCurrentSupport;
-    const children = tagSupport.templater.children;
+    const support = setUse.memory.childrenCurrentSupport;
+    const children = support.templater.children;
     return children;
 }
 setUse({
-    beforeRender: tagSupport => setCurrentTagSupport(tagSupport),
-    beforeRedraw: tagSupport => setCurrentTagSupport(tagSupport),
+    beforeRender: support => setCurrentSupport(support),
+    beforeRedraw: support => setCurrentSupport(support),
 });
 //# sourceMappingURL=children.js.map

package/js/state/children.js.map

@@ -1 +1 @@
-{"version":3,"file":"children.js","sourceRoot":"","sources":["../../ts/state/children.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAK,sBAAsB,CAAA;AAE5C,SAAS,oBAAoB,CAAC,OAAoC;IAChE,MAAM,CAAC,MAAM,CAAC,sBAAsB,GAAG,OAAqB,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAoC,CAAA;IACrE,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAA;IAC9C,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;IAC5D,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC;CAC7D,CAAC,CAAA"}
+{"version":3,"file":"children.js","sourceRoot":"","sources":["../../ts/state/children.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAK,sBAAsB,CAAA;AAE5C,SAAS,iBAAiB,CAAC,OAA8B;IACvD,MAAM,CAAC,MAAM,CAAC,sBAAsB,GAAG,OAAkB,CAAA;AAC3D,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAiC,CAAA;IAC/D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAA;IAC3C,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,CAAC;IACL,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;IACnD,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;CACpD,CAAC,CAAA"}

package/js/state/getCallbackValue.function.d.ts

@@ -0,0 +1,4 @@
+import { StateConfig } from "./state.utils.js";
+export declare class StateEchoBack {
+}
+export declare function getCallbackValue<T>(callback: StateConfig<T>): [T, T];

package/js/state/getCallbackValue.function.js

@@ -0,0 +1,10 @@
+export class StateEchoBack {
+}
+// sends a fake value and then sets back to received value
+export function getCallbackValue(callback) {
+    const oldState = callback(StateEchoBack); // get value and set to undefined
+    const [value] = oldState;
+    const [checkValue] = callback(value); // set back to original value
+    return [value, checkValue];
+}
+//# sourceMappingURL=getCallbackValue.function.js.map

package/js/state/getCallbackValue.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getCallbackValue.function.js","sourceRoot":"","sources":["../../ts/state/getCallbackValue.function.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;CAAG;AAE7B,0DAA0D;AAC1D,MAAM,UAAU,gBAAgB,CAC9B,QAAwB;IAExB,MAAM,QAAQ,GAAG,QAAQ,CAAC,aAAoB,CAAC,CAAA,CAAC,iCAAiC;IACjF,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAA;IAExB,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAE,KAAK,CAAE,CAAA,CAAC,6BAA6B;IACpE,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;AAC5B,CAAC"}

package/js/state/getStateValue.function.d.ts

@@ -0,0 +1,2 @@
+import { StateConfigItem } from './state.types.js';
+export declare function getStateValue<T>(state: StateConfigItem<T>): T | undefined;

package/js/state/getStateValue.function.js

@@ -0,0 +1,24 @@
+import { getCallbackValue } from './state.utils.js';
+const badLetState = 'letState function incorrectly used. Second item in array is not setting expected value.\n\n' +
+    'For "let" state use `let name = state(default)(x => [name, name = x])`\n\n' +
+    'For "const" state use `const name = state(default)()`\n\n' +
+    'Problem state:\n';
+export function getStateValue(state) {
+    const callback = state.callback;
+    // state()
+    if (!callback) {
+        return state.defaultValue;
+    }
+    // letState()
+    const [value, checkValue] = getCallbackValue(callback);
+    // TODO: not needed in production, needed in development
+    /*
+    if(checkValue !== StateEchoBack) {
+      const message = badLetState + (callback ? callback.toString() : JSON.stringify(state)) +'\n'
+      console.error(message, {state, callback, value, checkValue})
+      throw new Error(message)
+    }
+    */
+    return value;
+}
+//# sourceMappingURL=getStateValue.function.js.map

package/js/state/getStateValue.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStateValue.function.js","sourceRoot":"","sources":["../../ts/state/getStateValue.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,GAAG,6FAA6F;IACjH,4EAA4E;IAC5E,2DAA2D;IAC3D,kBAAkB,CAAA;AAElB,MAAM,UAAU,aAAa,CAC3B,KAAyB;IAEzB,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IAE/B,UAAU;IACV,IAAG,CAAC,QAAQ,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,YAAY,CAAA;IAC3B,CAAC;IAED,aAAa;IACb,MAAM,CAAC,KAAK,EAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAErD,wDAAwD;IACxD;;;;;;MAME;IAEF,OAAO,KAAK,CAAA;AACd,CAAC"}

package/js/state/handleProviderChanges.function.d.ts

@@ -1,3 +1,9 @@
 import { Provider } from './providers.js';
-import { TagSupport } from '../tag/TagSupport.class.js';
-export declare function handleProviderChanges(appSupport: TagSupport, provider: Provider): void;
+import { Support } from '../tag/Support.class.js';
+export declare function handleProviderChanges(appSupport: Support, provider: Provider): TagWithProvider[];
+type TagWithProvider = {
+    support: Support;
+    renderCount: number;
+    provider: Provider;
+};
+export {};

package/js/state/handleProviderChanges.function.js

@@ -1,33 +1,22 @@
-import { deepClone } from '../deepFunctions.js';
-import { renderTagSupport } from '../tag/render/renderTagSupport.function.js';
 export function handleProviderChanges(appSupport, provider) {
     const tagsWithProvider = getTagsWithProvider(appSupport, provider);
-    for (let index = tagsWithProvider.length - 1; index >= 0; --index) {
-        const { tagSupport, renderCount, provider } = tagsWithProvider[index];
-        if (tagSupport.global.deleted) {
-            continue; // i was deleted after another tag processed
-        }
-        const notRendered = renderCount === tagSupport.global.renderCount;
-        if (notRendered) {
-            provider.clone = deepClone(provider.instance);
-            renderTagSupport(tagSupport.global.newest, // tagSupport, // tagSupport.global.newest as TagSupport,
-            false);
-            continue;
-        }
-    }
+    return tagsWithProvider;
 }
 /** Updates and returns memory of tag providers */
-function getTagsWithProvider(tagSupport, provider, memory = []) {
+function getTagsWithProvider(support, provider, memory = []) {
+    const global = support.subject.global;
     memory.push({
-        tagSupport,
-        renderCount: tagSupport.global.renderCount,
+        support,
+        renderCount: global.renderCount,
         provider,
     });
     const childTags = provider.children;
     for (let index = childTags.length - 1; index >= 0; --index) {
+        const child = childTags[index];
+        const cGlobal = child.subject.global;
         memory.push({
-            tagSupport: childTags[index],
-            renderCount: childTags[index].global.renderCount,
+            support: child,
+            renderCount: cGlobal.renderCount,
             provider,
         });
     }

package/js/state/handleProviderChanges.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleProviderChanges.function.js","sourceRoot":"","sources":["../../ts/state/handleProviderChanges.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAK,4CAA4C,CAAA;AAG5E,MAAM,UAAU,qBAAqB,CACnC,UAAsB,EACtB,QAAkB;IAElB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAClE,KAAK,IAAI,KAAK,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAClE,MAAM,EAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QACnE,IAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7B,SAAQ,CAAC,4CAA4C;QACvD,CAAC;QAED,MAAM,WAAW,GAAG,WAAW,KAAK,UAAU,CAAC,MAAM,CAAC,WAAW,CAAA;QACjE,IAAG,WAAW,EAAE,CAAC;YACf,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC7C,gBAAgB,CACd,UAAU,CAAC,MAAM,CAAC,MAAoB,EAAE,yDAAyD;YACjG,KAAK,CACN,CAAA;YACD,SAAQ;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,kDAAkD;AAClD,SAAS,mBAAmB,CAC1B,UAAsB,EACtB,QAAkB,EAClB,SAA4B,EAAE;IAE9B,MAAM,CAAC,IAAI,CAAC;QACV,UAAU;QACV,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW;QAC1C,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAA;IACnC,KAAK,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC;YACV,UAAU,EAAE,SAAS,CAAC,KAAK,CAAC;YAC5B,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW;YAChD,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"handleProviderChanges.function.js","sourceRoot":"","sources":["../../ts/state/handleProviderChanges.function.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,qBAAqB,CACnC,UAAmB,EACnB,QAAkB;IAElB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAElE,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED,kDAAkD;AAClD,SAAS,mBAAmB,CAC1B,OAAgB,EAChB,QAAkB,EAClB,SAA4B,EAAE;IAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAmB,CAAA;IAClD,MAAM,CAAC,IAAI,CAAC;QACV,OAAO;QACP,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAA;IACnC,KAAK,IAAI,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;QAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAmB,CAAA;QACjD,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ;SACT,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/state/index.d.ts

@@ -1,12 +1,11 @@
 export * from './watch.function.js';
-export { setUse } from './setUse.function.js';
+export { setUseMemory } from './setUse.function.js';
 export { state } from './state.function.js';
 export * from './subject.function.js';
 export * from './letProp.function.js';
 export { letState } from './letState.function.js';
-export type { State } from './state.utils.js';
+export * from './state.types.js';
 export { providers } from './providers.js';
 export * from './callbackMaker.function.js';
 export * from './onInit.js';
 export * from './onDestroy.js';
-export * from './children.js';

package/js/state/index.js

@@ -1,12 +1,12 @@
 export * from './watch.function.js';
-export { setUse } from './setUse.function.js';
+export { setUseMemory } from './setUse.function.js';
 export { state } from './state.function.js';
 export * from './subject.function.js';
 export * from './letProp.function.js';
 export { letState } from './letState.function.js';
+export * from './state.types.js';
 export { providers } from './providers.js';
 export * from './callbackMaker.function.js';
 export * from './onInit.js';
 export * from './onDestroy.js';
-export * from './children.js';
 //# sourceMappingURL=index.js.map

package/js/state/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/state/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/state/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}

package/js/state/letState.function.d.ts

@@ -1,3 +1,5 @@
 import { GetSet } from './state.utils.js';
 /** Used for variables that need to remain the same variable during render passes. If defaultValue is a function it is called only once, its return value is first state, and let value can changed */
 export declare function letState<T>(defaultValue: T | (() => T)): ((getSet: GetSet<T>) => T);
+export declare function firstLetState<T>(defaultValue: T | (() => T)): (y: any) => any;
+export declare function reLetState<T>(): (y: any) => T;

package/js/state/letState.function.js

@@ -1,42 +1,42 @@
-import { getStateValue } from './state.utils.js';
-import { setUse } from './setUse.function.js';
+import { getStateValue } from './getStateValue.function.js';
+import { BasicTypes } from '../tag/ValueTypes.enum.js';
+import { setUseMemory } from './setUse.function.js';
 /** Used for variables that need to remain the same variable during render passes. If defaultValue is a function it is called only once, its return value is first state, and let value can changed */
 export function letState(defaultValue) {
-    const config = setUse.memory.stateConfig;
-    const rearray = config.rearray;
-    let getSetMethod;
-    const restate = rearray[config.array.length];
-    if (restate) {
-        let oldValue = getStateValue(restate);
-        getSetMethod = ((x) => [oldValue, oldValue = x]);
-        const push = {
-            get: () => getStateValue(push),
-            callback: getSetMethod,
-            lastValue: oldValue,
-            defaultValue: restate.defaultValue,
-        };
-        config.array.push(push);
-        return makeStateResult(oldValue, push);
-    }
+    const config = setUseMemory.stateConfig;
+    return config.handlers.letHandler(defaultValue);
+}
+export function firstLetState(defaultValue) {
+    const config = setUseMemory.stateConfig;
     // State first time run
-    const defaultFn = defaultValue instanceof Function ? defaultValue : () => defaultValue;
-    let initValue = defaultFn();
-    getSetMethod = ((x) => [initValue, initValue = x]);
+    const initValue = typeof (defaultValue) === BasicTypes.function ? defaultValue() : defaultValue;
     const push = {
-        get: () => getStateValue(push),
-        callback: getSetMethod,
-        lastValue: initValue,
+        get: function getPushState() {
+            return getStateValue(push);
+        },
         defaultValue: initValue,
     };
     config.array.push(push);
     return makeStateResult(initValue, push);
 }
+export function reLetState() {
+    const config = setUseMemory.stateConfig;
+    const rearray = config.rearray;
+    const restate = rearray[config.array.length];
+    let oldValue = getStateValue(restate);
+    const push = {
+        get: function getLetState() {
+            return getStateValue(push);
+        },
+        defaultValue: restate.defaultValue,
+    };
+    config.array.push(push);
+    return makeStateResult(oldValue, push);
+}
 function makeStateResult(initValue, push) {
-    // return initValue
-    const result = (y) => {
-        push.callback = y || (x => [initValue, initValue = x]);
+    return function msr(y) {
+        push.callback = y;
         return initValue;
     };
-    return result;
 }
 //# sourceMappingURL=letState.function.js.map

package/js/state/letState.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"letState.function.js","sourceRoot":"","sources":["../../ts/state/letState.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,aAAa,EAAE,MAAM,kBAAkB,CAAA;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,sMAAsM;AACtM,MAAM,UAAU,QAAQ,CACtB,YAA2B;IAE3B,MAAM,MAAM,GAAW,MAAM,CAAC,MAAM,CAAC,WAAW,CAAA;IAChD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAgB,CAAA;IACvC,IAAI,YAA4B,CAAA;IAEhC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAE5C,IAAG,OAAO,EAAE,CAAC;QACX,IAAI,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAM,CAAA;QAE1C,YAAY,GAAG,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAA;QACnD,MAAM,IAAI,GAAuB;YAC/B,GAAG,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAM;YACnC,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAA;QAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEvB,OAAO,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACxC,CAAC;IAED,uBAAuB;IACvB,MAAM,SAAS,GAAG,YAAY,YAAY,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,CAAA;IACtF,IAAI,SAAS,GAAG,SAAS,EAAE,CAAA;IAE3B,YAAY,GAAG,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,CAAA;IACrD,MAAM,IAAI,GAAuB;QAC/B,GAAG,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAM;QACnC,QAAQ,EAAE,YAAY;QACtB,SAAS,EAAE,SAAS;QACpB,YAAY,EAAE,SAAS;KACxB,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvB,OAAO,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACzC,CAAC;AAED,SAAS,eAAe,CACtB,SAAY,EACZ,IAAwB;IAExB,mBAAmB;IACnB,MAAM,MAAM,GAAI,CAAC,CAAM,EAAE,EAAE;QACzB,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,CAAA;QAEtD,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"letState.function.js","sourceRoot":"","sources":["../../ts/state/letState.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,sMAAsM;AACtM,MAAM,UAAU,QAAQ,CACtB,YAA2B;IAE3B,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAC/C,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;AACjD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,YAA2B;IAE3B,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAC/C,uBAAuB;IACvB,MAAM,SAAS,GAAG,OAAM,CAAC,YAAY,CAAC,KAAK,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAE,YAAyB,EAAE,CAAC,CAAC,CAAC,YAAY,CAAA;IAC5G,MAAM,IAAI,GAAuB;QAC/B,GAAG,EAAE,SAAS,YAAY;YACxB,OAAO,aAAa,CAAC,IAAI,CAAM,CAAA;QACjC,CAAC;QACD,YAAY,EAAE,SAAS;KACxB,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvB,OAAO,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAgB,CAAA;IACvC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAG5C,IAAI,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAM,CAAA;IAE1C,MAAM,IAAI,GAAuB;QAC/B,GAAG,EAAE,SAAS,WAAW;YACvB,OAAO,aAAa,CAAC,IAAI,CAAM,CAAA;QACjC,CAAC;QACD,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAA;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvB,OAAO,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;AACxC,CAAC;AAED,SAAS,eAAe,CACtB,SAAY,EACZ,IAAwB;IAExB,OAAO,SAAS,GAAG,CAAC,CAAM;QACxB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;QACjB,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;AACH,CAAC"}

package/js/state/onDestroy.js

@@ -1,9 +1,10 @@
 import { getSupportInCycle } from "../tag/getSupportInCycle.function.js";
 import { state } from "./state.function.js";
 export function onDestroy(callback) {
-    state(() => {
-        const tagSupport = getSupportInCycle();
-        tagSupport?.global.destroy$.toCallback(callback);
+    state(function stateDestroy() {
+        const support = getSupportInCycle();
+        const global = support.subject.global;
+        global.destroy$.toCallback(callback);
     });
 }
 //# sourceMappingURL=onDestroy.js.map

package/js/state/onDestroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"onDestroy.js","sourceRoot":"","sources":["../../ts/state/onDestroy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAI3C,MAAM,UAAU,SAAS,CACvB,QAA2B;IAE3B,KAAK,CAAC,GAAG,EAAE;QACT,MAAM,UAAU,GAAG,iBAAiB,EAAgB,CAAA;QACpD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"onDestroy.js","sourceRoot":"","sources":["../../ts/state/onDestroy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAI3C,MAAM,UAAU,SAAS,CACvB,QAA2B;IAE3B,KAAK,CAAC,SAAS,YAAY;QACzB,MAAM,OAAO,GAAG,iBAAiB,EAAa,CAAA;QAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAA0B,CAAA;QACzD,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/js/state/providers.d.ts

@@ -1,11 +1,10 @@
-import { TagSupport } from '../tag/TagSupport.class.js';
+import { Support } from '../tag/Support.class.js';
 export type Provider = {
     constructMethod: any;
     instance: any;
-    clone: any;
     stateDiff: number;
-    owner: TagSupport;
-    children: TagSupport[];
+    owner: Support;
+    children: Support[];
 };
 type ProviderConstructor<T> = (new (...args: any[]) => T) | (() => T);
 type functionProvider<T> = () => T;

package/js/state/providers.js

@@ -1,40 +1,40 @@
-import { deepClone } from '../deepFunctions.js';
-import { setUse } from './setUse.function.js';
+import { getSupportInCycle } from '../tag/getSupportInCycle.function.js';
+import { setUseMemory } from './setUse.function.js';
 import { state } from './state.function.js';
 export const providers = {
     create: (constructMethod) => {
         const stateDiffMemory = state(() => ({ stateDiff: 0, provider: undefined }));
         // mimic how many states were called the first time
         if (stateDiffMemory.stateDiff) {
-            for (let x = stateDiffMemory.stateDiff; x > 0; --x) {
+            let x = stateDiffMemory.stateDiff;
+            while (x--) {
                 state(undefined);
             }
             const result = state(undefined);
             return result;
         }
         const result = state(() => {
-            const memory = setUse.memory;
-            const stateConfig = memory.stateConfig;
+            const stateConfig = setUseMemory.stateConfig;
             const oldStateCount = stateConfig.array.length;
             // Providers with provider requirements just need to use providers.create() and providers.inject()
-            const instance = 'prototype' in constructMethod ? new constructMethod() : constructMethod();
-            const tagSupport = stateConfig.tagSupport;
+            const instance = constructMethod.prototype ? new constructMethod() : constructMethod();
+            const support = stateConfig.support;
             const stateDiff = stateConfig.array.length - oldStateCount;
             const provider = {
                 constructMethod,
                 instance,
-                clone: deepClone(instance),
                 stateDiff,
-                owner: tagSupport,
+                owner: support,
                 children: [],
             };
             stateDiffMemory.provider = provider;
-            tagSupport.global.providers.push(provider);
+            const global = support.subject.global;
+            const providers = global.providers = global.providers || [];
+            providers.push(provider);
             stateDiffMemory.stateDiff = stateDiff;
             return instance;
         });
         const cm = constructMethod;
-        // const compareTo = cm.compareTo = cm.compareTo || cm.toString()
         const compareTo = cm.compareTo = cm.toString();
         stateDiffMemory.provider.constructMethod.compareTo = compareTo;
         return result;
@@ -47,16 +47,21 @@ export const providers = {
     inject: (constructor) => {
         // find once, return same every time after
         return state(() => {
-            const memory = setUse.memory;
+            // const memory = setUse.memory
             const cm = constructor;
             const compareTo = cm.compareTo = cm.compareTo || constructor.toString();
-            const tagSupport = memory.stateConfig.tagSupport;
+            const support = getSupportInCycle(); // memory.stateConfig.support as Support
             const providers = [];
             let owner = {
-                ownerTagSupport: tagSupport.ownerTagSupport
+                ownerSupport: support.ownerSupport
             };
-            while (owner.ownerTagSupport) {
-                const ownerProviders = owner.ownerTagSupport.global.providers;
+            while (owner.ownerSupport) {
+                const ownGlobal = owner.ownerSupport.subject.global;
+                const ownerProviders = ownGlobal.providers;
+                if (!ownerProviders) {
+                    owner = owner.ownerSupport; // cause reloop checking next parent
+                    continue;
+                }
                 const provider = ownerProviders.find(provider => {
                     providers.push(provider);
                     const constructorMatch = provider.constructMethod.compareTo === compareTo;
@@ -65,13 +70,13 @@ export const providers = {
                     }
                 });
                 if (provider) {
-                    provider.clone = deepClone(provider.instance); // keep a copy of the latest before any change occur
-                    const tagSupport = memory.stateConfig.tagSupport;
-                    tagSupport.global.providers.push(provider);
-                    provider.children.push(tagSupport);
+                    const global = support.subject.global;
+                    const providers = global.providers = global.providers || [];
+                    providers.push(provider);
+                    provider.children.push(support);
                     return provider.instance;
                 }
-                owner = owner.ownerTagSupport; // cause reloop checking next parent
+                owner = owner.ownerSupport; // cause reloop checking next parent
             }
             const msg = `Could not inject provider: ${constructor.name} ${constructor}`;
             console.warn(`${msg}. Available providers`, providers);