taggedjs 2.5.24 → 2.6.2

package/js/state/providersChangeCheck.function.js

@@ -1,18 +1,17 @@
-import { deepClone, deepEqual } from '../deepFunctions.js';
 import { handleProviderChanges } from './handleProviderChanges.function.js';
 export function providersChangeCheck(support) {
     const global = support.subject.global;
-    const providersWithChanges = global.providers.filter(provider => !deepEqual(provider.instance, provider.clone));
-    let hadChanged = false;
+    const providers = global.providers;
+    if (!providers) {
+        return [];
+    }
+    const prosWithChanges = [];
     // reset clones
-    for (let index = providersWithChanges.length - 1; index >= 0; --index) {
-        const provider = providersWithChanges[index];
+    for (const provider of providers) {
         const owner = provider.owner;
-        if (handleProviderChanges(owner, provider)) {
-            hadChanged = true;
-        }
-        provider.clone = deepClone(provider.instance);
+        const hasChange = handleProviderChanges(owner, provider);
+        prosWithChanges.push(...hasChange.map(x => x.support));
     }
-    return hadChanged;
+    return prosWithChanges;
 }
 //# sourceMappingURL=providersChangeCheck.function.js.map

package/js/state/providersChangeCheck.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"providersChangeCheck.function.js","sourceRoot":"","sources":["../../ts/state/providersChangeCheck.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAG3E,MAAM,UAAU,oBAAoB,CAClC,OAA8B;IAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;IACrC,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/G,IAAI,UAAU,GAAG,KAAK,CAAA;IAEtB,eAAe;IACf,KAAK,IAAI,KAAK,GAAG,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QACtE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;QAE5B,IAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC1C,UAAU,GAAG,IAAI,CAAA;QACnB,CAAC;QAED,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC"}
+{"version":3,"file":"providersChangeCheck.function.js","sourceRoot":"","sources":["../../ts/state/providersChangeCheck.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAI3E,MAAM,UAAU,oBAAoB,CAClC,OAAmB;IAEnB,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAA0B,CAAA;IACzD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IAElC,IAAG,CAAC,SAAS,EAAE,CAAC;QACd,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,eAAe,GAAG,EAAE,CAAA;IAE1B,eAAe;IACf,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;QAC5B,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACxD,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,eAAe,CAAA;AACxB,CAAC"}

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

@@ -1,22 +1,12 @@
 import { BaseSupport, Support } from '../tag/Support.class.js';
 import { Config } from './state.utils.js';
-interface TagUse {
-    beforeRender: (support: BaseSupport | Support, ownerTag?: Support | BaseSupport) => void;
-    beforeRedraw: (support: BaseSupport | Support, tag: Support | BaseSupport) => void;
-    afterRender: (support: BaseSupport | Support, ownerSupport?: Support | BaseSupport) => void;
-    beforeDestroy: (support: BaseSupport | Support, tag: Support | BaseSupport) => void;
-}
 export type UseOptions = {
     beforeRender?: (support: Support | BaseSupport, ownerTag?: Support | BaseSupport) => void;
     beforeRedraw?: (support: BaseSupport | Support, tag: Support | BaseSupport) => void;
     afterRender?: (support: BaseSupport | Support, ownerSupport?: Support | BaseSupport) => void;
     beforeDestroy?: (support: BaseSupport | Support, tag: Support | BaseSupport) => void;
 };
-export declare function setUse(use: UseOptions): void;
-export declare namespace setUse {
-    var tagUse: TagUse[];
-    var memory: UseMemory;
-}
+export declare const setUseMemory: UseMemory;
 type UseMemory = (Record<string, any> & {
     stateConfig: Config;
     currentSupport: Support;

package/js/state/setUse.function.js

@@ -1,14 +1,13 @@
-const tagUse = [];
-export function setUse(use) {
-    // must provide defaults
-    const useMe = {
-        beforeRender: use.beforeRender || (() => undefined),
-        beforeRedraw: use.beforeRedraw || (() => undefined),
-        afterRender: use.afterRender || (() => undefined),
-        beforeDestroy: use.beforeDestroy || (() => undefined),
-    };
-    setUse.tagUse.push(useMe);
-}
-setUse.tagUse = tagUse;
-setUse.memory = {};
+import { firstLetState } from './letState.function.js';
+import { runFirstState } from './stateHandlers.js';
+export const setUseMemory = {
+    stateConfig: {
+        array: [], // state memory on the first render
+        version: Date.now(),
+        handlers: {
+            handler: runFirstState,
+            letHandler: firstLetState,
+        }
+    },
+};
 //# sourceMappingURL=setUse.function.js.map

package/js/state/setUse.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"setUse.function.js","sourceRoot":"","sources":["../../ts/state/setUse.function.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,GAAa,EAAE,CAAA;AAyB3B,MAAM,UAAU,MAAM,CAAC,GAAe;IACpC,wBAAwB;IACxB,MAAM,KAAK,GAAW;QACpB,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACnD,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACnD,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;QACjD,aAAa,EAAE,GAAG,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;KACtD,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,MAAM,CAAA;AACtB,MAAM,CAAC,MAAM,GAAG,EAAe,CAAA"}
+{"version":3,"file":"setUse.function.js","sourceRoot":"","sources":["../../ts/state/setUse.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAYlD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE;QACX,KAAK,EAAE,EAAW,EAAE,mCAAmC;QACvD,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;QACnB,QAAQ,EAAE;YACR,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,aAAa;SAC1B;KACF;CACW,CAAA"}

package/js/state/state.function.js

@@ -1,51 +1,6 @@
-import { setUse } from './setUse.function.js';
-import { getStateValue } from './state.utils.js';
-import { syncStates } from './syncStates.function.js';
+import { setUseMemory } from './setUse.function.js';
 /** Used for variables that need to remain the same variable during render passes */
 export function state(defaultValue) {
-    const config = setUse.memory.stateConfig;
-    let getSetMethod;
-    const rearray = config.rearray;
-    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 oldValue;
-    }
-    // State first time run
-    const defaultFn = defaultValue instanceof Function ? defaultValue : () => defaultValue;
-    let initValue = defaultFn();
-    // the state is actually intended to be a function
-    if (initValue instanceof Function) {
-        const oldState = config.array;
-        const support = config.support;
-        const original = initValue;
-        initValue = ((...args) => {
-            const global = support.subject.global;
-            const newest = global.newest;
-            const newState = newest.state;
-            syncStates(newState, oldState);
-            const result = original(...args);
-            syncStates(oldState, newState);
-            return result;
-        });
-        initValue.original = original;
-    }
-    getSetMethod = ((x) => [initValue, initValue = x]);
-    const push = {
-        get: () => getStateValue(push),
-        callback: getSetMethod,
-        lastValue: initValue,
-        defaultValue: initValue,
-    };
-    config.array.push(push);
-    return initValue;
+    return setUseMemory.stateConfig.handlers.handler(defaultValue);
 }
 //# sourceMappingURL=state.function.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"state.function.js","sourceRoot":"","sources":["../../ts/state/state.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAA+C,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAErD,oFAAoF;AACpF,MAAM,UAAU,KAAK,CACnB,YAA2B;IAE3B,MAAM,MAAM,GAAW,MAAM,CAAC,MAAM,CAAC,WAAW,CAAA;IAChD,IAAI,YAA4B,CAAA;IAChC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAgB,CAAA;IAEvC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC5C,IAAG,OAAO,EAAE,CAAC;QACX,IAAI,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAM,CAAA;QAC1C,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,QAAQ,CAAA;IACjB,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,kDAAkD;IAClD,IAAG,SAAS,YAAY,QAAQ,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAA;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAkB,CAAA;QACzC,MAAM,QAAQ,GAAG,SAAS,CAAA;QAE1B,SAAS,GAAG,CAAC,CAAC,GAAG,IAAW,EAAE,EAAE;YAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAA;YACrC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAiB,CAAA;YACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAA;YAE7B,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAE9B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;YAEhC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAE9B,OAAO,MAAM,CAAA;QACf,CAAC,CAAQ,CAER;QAAC,SAAiB,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACzC,CAAC;IAED,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,SAAS,CAAA;AAClB,CAAC"}
+{"version":3,"file":"state.function.js","sourceRoot":"","sources":["../../ts/state/state.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,oFAAoF;AACpF,MAAM,UAAU,KAAK,CACnB,YAA2B;IAE3B,OAAO,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAChE,CAAC"}

package/js/state/state.types.d.ts

@@ -0,0 +1,8 @@
+export type StateConfig<T> = (x: T) => [T, T];
+export type StateConfigItem<T> = {
+    get: () => T;
+    callback?: StateConfig<T>;
+    defaultValue?: T;
+    watch?: T;
+};
+export type State = StateConfigItem<any>[];

package/js/state/state.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=state.types.js.map

package/js/state/state.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.types.js","sourceRoot":"","sources":["../../ts/state/state.types.ts"],"names":[],"mappings":""}

package/js/state/state.utils.d.ts

@@ -1,20 +1,21 @@
+import { firstLetState } from './letState.function.js';
 import { BaseSupport, Support } from '../tag/Support.class.js';
-export type StateConfig<T> = (x: T) => [T, T];
-export type StateConfigItem<T> = {
-    get: () => T;
-    callback?: StateConfig<T>;
-    lastValue?: T;
-    defaultValue?: T;
-    watch?: T;
-};
+import { runFirstState } from './stateHandlers.js';
+import { State, StateConfig } from './state.types.js';
 export type Config = {
+    version: number;
     support?: BaseSupport | Support;
     array: State;
     rearray?: State;
+    handlers: {
+        handler: typeof runFirstState;
+        letHandler: typeof firstLetState;
+    };
 };
-export type State = StateConfigItem<any>[];
 export type GetSet<T> = (y: T) => [T, T];
-export declare function getStateValue<T>(state: StateConfigItem<T>): T | undefined;
+export declare function afterRender(support: Support | BaseSupport): void;
+export declare function initState(support: Support | BaseSupport, config: Config): void;
+export declare function reState(support: Support | BaseSupport, config: Config): void;
 export declare class StateEchoBack {
 }
 export declare function getCallbackValue<T>(callback: StateConfig<T>): [T, T];

package/js/state/state.utils.js

@@ -1,74 +1,44 @@
-import { StateMismatchError } from '../errors.js';
-import { setUse } from './setUse.function.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';
-setUse.memory.stateConfig = {
-    array: [], // state memory on the first render
-    // rearray: [] as State,
-};
-const beforeRender = (support) => initState(support);
-setUse({
-    beforeRender,
-    beforeRedraw: beforeRender,
-    afterRender: (support) => {
-        const state = support.state;
-        const config = setUse.memory.stateConfig;
-        const rearray = config.rearray;
-        if (rearray.length) {
-            if (rearray.length !== config.array.length) {
-                const message = `States lengths have changed ${rearray.length} !== ${config.array.length}. State tracking requires the same amount of function calls every render. Typically this errors is thrown when a state like function call occurs only for certain conditions or when a function is intended to be wrapped with a tag() call`;
-                const wrapper = support.templater?.wrapper;
-                const details = {
-                    oldStates: config.array,
-                    newStates: config.rearray,
-                    tagFunction: wrapper.parentWrap.original,
-                };
-                const error = new StateMismatchError(message, details);
-                console.warn(message, details);
-                throw error;
-            }
-        }
-        delete config.rearray; // clean up any previous runs
-        delete config.support;
-        state.length = 0;
-        state.push(...config.array);
-        for (let index = state.length - 1; index >= 0; --index) {
-            const item = state[index];
-            item.lastValue = getStateValue(item); // set last values
-        }
-        config.array = [];
+import { firstLetState, reLetState } from './letState.function.js';
+import { runFirstState, runRestate } from './stateHandlers.js';
+import { setUseMemory } from './setUse.function.js';
+export function afterRender(support) {
+    const config = setUseMemory.stateConfig;
+    // TODO: only needed in development
+    /*
+    const rearray = config.rearray as unknown as State[]
+    if(rearray.length && rearray.length !== config.array.length) {
+      const message = `States lengths have changed ${rearray.length} !== ${config.array.length}. State tracking requires the same amount of function calls every render. Typically this errors is thrown when a state like function call occurs only for certain conditions or when a function is intended to be wrapped with a tag() call`
+      const wrapper = support.templater?.wrapper as Wrapper
+      const details = {
+        oldStates: config.array,
+        newStates: config.rearray,
+        tagFunction: wrapper.parentWrap.original,
+      }
+      const error = new StateMismatchError(message,details)
+      console.warn(message,details)
+      throw error
     }
-});
-export function getStateValue(state) {
-    const callback = state.callback;
-    if (!callback) {
-        return state.defaultValue;
-    }
-    const [value, checkValue] = getCallbackValue(callback);
-    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;
+    */
+    delete config.support;
+    support.state = config.array;
+    config.array = [];
 }
-export class StateEchoBack {
+export function initState(support, config) {
+    config.handlers.handler = runFirstState;
+    config.handlers.letHandler = firstLetState;
+    config.rearray = [];
+    config.support = support;
 }
-function initState(support) {
+export function reState(support, config) {
     const state = support.state;
-    const config = setUse.memory.stateConfig;
-    config.rearray = [];
-    const stateLength = state?.length;
-    if (stateLength) {
-        for (let index = 0; index < stateLength; ++index) {
-            getStateValue(state[index]);
-        }
-        config.rearray.push(...state);
-    }
+    config.rearray = state;
+    config.handlers.handler = runRestate;
+    config.handlers.letHandler = reLetState;
     config.support = support;
 }
+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;

package/js/state/state.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.utils.js","sourceRoot":"","sources":["../../ts/state/state.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.utils.js","sourceRoot":"","sources":["../../ts/state/state.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAElE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAK,sBAAsB,CAAA;AAelD,MAAM,UAAU,WAAW,CACzB,OAA8B;IAE9B,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAE/C,mCAAmC;IACnC;;;;;;;;;;;;;;MAcE;IAEF,OAAO,MAAM,CAAC,OAAO,CAAA;IAErB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,OAA8B,EAC9B,MAAc;IAEd,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAG,aAAa,CAAA;IACvC,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,aAAoB,CAAA;IAEjD,MAAM,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAA;AAC1B,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,OAA8B,EAC9B,MAAc;IAEd,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAC3B,MAAM,CAAC,OAAO,GAAG,KAAK,CAAA;IAEtB,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAG,UAAiB,CAAA;IAC3C,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,UAAiB,CAAA;IAC9C,MAAM,CAAC,OAAO,GAAG,OAAO,CAAA;AAC1B,CAAC;AAED,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/stateHandlers.d.ts

@@ -0,0 +1,2 @@
+export declare function runRestate<T>(): any;
+export declare function runFirstState<T>(defaultValue: T | (() => T)): T;

package/js/state/stateHandlers.js

@@ -0,0 +1,36 @@
+import { setUseMemory } from './setUse.function.js';
+import { getStateValue } from './getStateValue.function.js';
+import { BasicTypes } from '../tag/ValueTypes.enum.js';
+export function runRestate() {
+    const config = setUseMemory.stateConfig;
+    const rearray = config.rearray;
+    const restate = rearray[config.array.length];
+    config.array.push(restate);
+    return restate.defaultValue;
+}
+export function runFirstState(defaultValue) {
+    const config = setUseMemory.stateConfig;
+    // State first time run
+    let initValue = defaultValue;
+    if (typeof (defaultValue) === BasicTypes.function) {
+        initValue = defaultValue();
+    }
+    // the state is actually intended to be a function
+    if (typeof (initValue) === BasicTypes.function) {
+        const original = initValue;
+        initValue = function initValueFun(...args) {
+            const result = original(...args);
+            return result;
+        };
+        initValue.original = original;
+    }
+    const push = {
+        get: function pushState() {
+            return getStateValue(push);
+        },
+        defaultValue: initValue,
+    };
+    config.array.push(push);
+    return initValue;
+}
+//# sourceMappingURL=stateHandlers.js.map

package/js/state/stateHandlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stateHandlers.js","sourceRoot":"","sources":["../../ts/state/stateHandlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,MAAM,UAAU,UAAU;IACxB,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAgB,CAAA;IAEvC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC5C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,OAAO,OAAO,CAAC,YAAY,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,YAA2B;IAE3B,MAAM,MAAM,GAAW,YAAY,CAAC,WAAW,CAAA;IAE/C,uBAAuB;IACvB,IAAI,SAAS,GAAG,YAAY,CAAA;IAE5B,IAAG,OAAM,CAAC,YAAY,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;QAChD,SAAS,GAAI,YAAyB,EAAE,CAAA;IAC1C,CAAC;IAED,kDAAkD;IAClD,IAAG,OAAM,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,SAAqB,CAAA;QAEtC,SAAS,GAAG,SAAS,YAAY,CAAC,GAAG,IAAW;YAC9C,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;YAChC,OAAO,MAAM,CAAA;QACf,CAAQ,CAEP;QAAC,SAAiB,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACzC,CAAC;IAED,MAAM,IAAI,GAAuB;QAC/B,GAAG,EAAE,SAAS,SAAS;YACrB,OAAO,aAAa,CAAC,IAAI,CAAM,CAAA;QACjC,CAAC;QACD,YAAY,EAAE,SAAc;KAC7B,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEvB,OAAO,SAAc,CAAA;AACvB,CAAC"}

package/js/state/subject.function.js

@@ -1,13 +1,15 @@
 import { Subject, ValueSubject } from '../subject/index.js';
 import { getSupportInCycle } from '../tag/getSupportInCycle.function.js';
-import { setUse } from './setUse.function.js';
+import { setUseMemory } from './setUse.function.js';
 import { state } from './state.function.js';
 import { syncStates } from './syncStates.function.js';
 /** Create a Subject that on updates will sync state values to keep chained functions using latest variables */
 export function subject(value, onSubscription) {
-    const oldestState = state(() => setUse.memory.stateConfig.array);
+    const oldestState = state(function subjectState() {
+        return setUseMemory.stateConfig.array;
+    });
     const nowSupport = getSupportInCycle();
-    return state(() => {
+    return state(function subjectState() {
         const subject = new Subject(value, onSubscription).pipe(x => {
             syncStates(nowSupport.state, oldestState);
             return x;
@@ -16,9 +18,11 @@ export function subject(value, onSubscription) {
     });
 }
 subject._value = (value) => {
-    const oldestState = state(() => setUse.memory.stateConfig.array);
+    const oldestState = state(function subjectValue() {
+        return setUseMemory.stateConfig.array;
+    });
     const nowSupport = getSupportInCycle();
-    return state(() => {
+    return state(function subjectValue() {
         const subject = new ValueSubject(value).pipe(x => {
             syncStates(nowSupport.state, oldestState);
             return x;
@@ -27,7 +31,7 @@ subject._value = (value) => {
     });
 };
 function all(args) {
-    const oldestState = state(() => setUse.memory.stateConfig.array);
+    const oldestState = state(() => setUseMemory.stateConfig.array);
     const nowSupport = getSupportInCycle();
     return Subject.all(args).pipe(x => {
         syncStates(nowSupport.state, oldestState);

package/js/state/subject.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"subject.function.js","sourceRoot":"","sources":["../../ts/state/subject.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAErD,+GAA+G;AAC/G,MAAM,UAAU,OAAO,CACrB,KAAS,EACT,cAAkC;IAElC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,KAAK,CAAC,GAAG,EAAE;QAChB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC1D,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YACzC,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,CAAC,MAAM,GAAG,CAAI,KAAQ,EAAE,EAAE;IAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,KAAK,CAAC,GAAG,EAAE;QAChB,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/C,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YACzC,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAQD,SAAS,GAAG,CAAC,IAAW;IACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QACvC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACzC,OAAO,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,CAAC,GAAG,GAAG,GAAG,CAAA"}
+{"version":3,"file":"subject.function.js","sourceRoot":"","sources":["../../ts/state/subject.function.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAErD,+GAA+G;AAC/G,MAAM,UAAU,OAAO,CACrB,KAAS,EACT,cAAkC;IAElC,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,YAAY;QAC7C,OAAO,YAAY,CAAC,WAAW,CAAC,KAAK,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,KAAK,CAAC,SAAS,YAAY;QAChC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC1D,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YACzC,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,CAAC,MAAM,GAAG,CAAI,KAAQ,EAAE,EAAE;IAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,YAAY;QAC7C,OAAO,YAAY,CAAC,WAAW,CAAC,KAAK,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,KAAK,CAAC,SAAS,YAAY;QAChC,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/C,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;YACzC,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAQD,SAAS,GAAG,CAAC,IAAW;IACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAC/D,MAAM,UAAU,GAAG,iBAAiB,EAAa,CAAA;IACjD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QACvC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;QACzC,OAAO,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,CAAC,GAAG,GAAG,GAAG,CAAA"}

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

@@ -1,2 +1,2 @@
-import { State } from './state.utils';
+import { State } from './state.types.js';
 export declare function syncStates(stateFrom: State, stateTo: State): void;

package/js/state/syncStates.function.js

@@ -2,11 +2,14 @@ export function syncStates(stateFrom, stateTo) {
     for (let index = stateFrom.length - 1; index >= 0; --index) {
         const state = stateFrom[index];
         const fromValue = state.get();
-        const callback = stateTo[index].callback;
-        if (callback) {
-            callback(fromValue); // set the value
-        }
-        stateTo[index].lastValue = fromValue; // record the value
+        const s = stateTo[index];
+        setState(s, fromValue);
+    }
+}
+function setState(s, fromValue) {
+    const callback = s.callback;
+    if (callback) {
+        callback(fromValue); // set the value
     }
 }
 //# sourceMappingURL=syncStates.function.js.map

package/js/state/syncStates.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncStates.function.js","sourceRoot":"","sources":["../../ts/state/syncStates.function.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,UAAU,CACxB,SAAgB,EAChB,OAAc;IAEd,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,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;QAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAA;QAExC,IAAG,QAAQ,EAAE,CAAC;YACZ,QAAQ,CAAE,SAAS,CAAE,CAAA,CAAC,gBAAgB;QACxC,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,SAAS,CAAA,CAAC,mBAAmB;IAC1D,CAAC;AACH,CAAC"}
+{"version":3,"file":"syncStates.function.js","sourceRoot":"","sources":["../../ts/state/syncStates.function.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,UAAU,CACxB,SAAgB,EAChB,OAAc;IAEd,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,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;QAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;IACxB,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CACf,CAAuB,EACvB,SAAc;IAEd,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAA;IAE3B,IAAG,QAAQ,EAAE,CAAC;QACZ,QAAQ,CAAE,SAAS,CAAE,CAAA,CAAC,gBAAgB;IACxC,CAAC;AACH,CAAC"}

package/js/state/watch.function.js

@@ -1,6 +1,6 @@
 import { ValueSubject } from '../subject/index.js';
 import { getSupportInCycle } from '../tag/getSupportInCycle.function.js';
-import { setUse } from './setUse.function.js';
+import { setUseMemory } from './setUse.function.js';
 import { state } from './state.function.js';
 import { syncStates } from './syncStates.function.js';
 /**
@@ -28,15 +28,15 @@ function newWatch(setup) {
  * @param param2
  * @returns
  */
-const setupWatch = (currentValues, callback, { init, before = () => true, final = defaultFinally, } = {}) => {
-    let previous = state({
+const setupWatch = (currentValues, callback, { init, before, final = defaultFinally, } = {}) => {
+    const previous = state({
         pastResult: undefined,
         values: undefined,
     });
     const previousValues = previous.values;
     // First time running watch?
     if (previousValues === undefined) {
-        if (!before(currentValues)) {
+        if (before && !before(currentValues)) {
             previous.values = currentValues;
             return previous.pastResult; // do not continue
         }
@@ -50,7 +50,7 @@ const setupWatch = (currentValues, callback, { init, before = () => true, final
     if (allExact) {
         return previous.pastResult;
     }
-    if (!before(currentValues)) {
+    if (before && !before(currentValues)) {
         previous.values = currentValues;
         return previous.pastResult; // do not continue
     }
@@ -78,7 +78,7 @@ function defineOnMethod(getWatch, attachTo) {
                     const nowSupport = getSupportInCycle();
                     const setTo = callback(currentValues, previousValues);
                     if (nowSupport !== firstSupport) {
-                        const newestState = setUse.memory.stateConfig.array;
+                        const newestState = setUseMemory.stateConfig.array;
                         syncStates(newestState, firstSupport.state);
                     }
                     subject.next(setTo);

package/js/state/watch.function.js.map

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

package/js/subject/Subject.class.d.ts

@@ -7,7 +7,6 @@ export declare class Subject<T> implements SubjectLike<T> {
     isSubject: boolean;
     subscribers: Subscription<T>[];
     subscribeWith?: (x: SubjectSubscriber<T>) => Subscription<T>;
-    _value?: T;
     constructor(value?: T | undefined, onSubscription?: OnSubscription<T> | undefined);
     subscribe(callback: SubjectSubscriber<T>): Subscription<T> | Subscription<any>;
     next(value?: any): void;
@@ -36,4 +35,12 @@ export declare class Subject<T> implements SubjectLike<T> {
     static all<A>(args: [Subject<A> | A]): Subject<[A]>;
     static globalSubCount$: Subject<number>;
 }
-export declare function defineValueOn(subject: Subject<any>): void;
+export declare class Subjective<T> extends Subject<T> {
+    value?: T | undefined;
+    onSubscription?: OnSubscription<T> | undefined;
+    _value?: T;
+    constructor(value?: T | undefined, onSubscription?: OnSubscription<T> | undefined);
+    next(value?: any): void;
+    emit(): void;
+}
+export declare function defineValueOn(subject: Subjective<any>): void;