taggedjs 2.5.4 → 2.5.5

package/js/state/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/state/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,cAAc,0BAA0B,CAAA;AACxC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/state/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,cAAc,0BAA0B,CAAA;AACxC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA"}

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

@@ -1,2 +1,2 @@
-import { TagSupport } from '../TagSupport.class';
+import { TagSupport } from '../tag/TagSupport.class';
 export declare function providersChangeCheck(tagSupport: TagSupport): void;

package/js/state/provider.utils.js

@@ -1,17 +1,17 @@
 import { deepClone, deepEqual } from '../deepFunctions';
-import { renderTagSupport } from '../renderTagSupport.function';
+import { renderTagSupport } from '../tag/render/renderTagSupport.function';
 export function providersChangeCheck(tagSupport) {
     const global = tagSupport.global;
     const providersWithChanges = global.providers.filter(provider => !deepEqual(provider.instance, provider.clone));
     // reset clones
     providersWithChanges.forEach(provider => {
-        const appElement = tagSupport.getAppElement();
-        handleProviderChanges(appElement, provider);
+        const appSupport = tagSupport.getAppTagSupport();
+        handleProviderChanges(appSupport, provider);
         provider.clone = deepClone(provider.instance);
     });
 }
-function handleProviderChanges(appElement, provider) {
-    const tagsWithProvider = getTagsWithProvider(appElement, provider);
+function handleProviderChanges(appSupport, provider) {
+    const tagsWithProvider = getTagsWithProvider(appSupport, provider);
     tagsWithProvider.forEach(({ tagSupport, renderCount, provider }) => {
         if (tagSupport.global.deleted) {
             return; // i was deleted after another tag processed
@@ -19,14 +19,14 @@ function handleProviderChanges(appElement, provider) {
         const notRendered = renderCount === tagSupport.global.renderCount;
         if (notRendered) {
             provider.clone = deepClone(provider.instance);
-            renderTagSupport(tagSupport, false);
+            return renderTagSupport(tagSupport, false);
         }
     });
 }
 function getTagsWithProvider(tagSupport, provider, memory = []) {
     const global = tagSupport.global;
     const compare = global.providers;
-    const hasProvider = compare.find(xProvider => xProvider.constructMethod === provider.constructMethod);
+    const hasProvider = compare.find(xProvider => xProvider.constructMethod.compareTo === provider.constructMethod.compareTo);
     if (hasProvider) {
         memory.push({
             tagSupport,

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

@@ -1 +1 @@
-{"version":3,"file":"provider.utils.js","sourceRoot":"","sources":["../../ts/state/provider.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAG/D,MAAM,UAAU,oBAAoB,CAClC,UAAsB;IAEtB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;IAChC,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAC9D,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAC9C,CAAA;IAED,eAAe;IACf,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACtC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,CAAA;QAE7C,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3C,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,UAAsB,EACtB,QAAkB;IAElB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAElE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAC,EAAE,EAAE;QAC/D,IAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAM,CAAC,4CAA4C;QACrD,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,EACV,KAAK,CACN,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,UAAsB,EACtB,QAAkB,EAClB,SAA4B,EAAE;IAE9B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;IAChC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAA;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAC9B,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,KAAK,QAAQ,CAAC,eAAe,CACpE,CAAA;IAED,IAAG,WAAW,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC;YACV,UAAU;YACV,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,mBAAmB,CACvD,KAAK,EACL,QAAQ,EACR,MAAM,CACP,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"provider.utils.js","sourceRoot":"","sources":["../../ts/state/provider.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAG1E,MAAM,UAAU,oBAAoB,CAClC,UAAsB;IAEtB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;IAChC,MAAM,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAC9D,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAC9C,CAAA;IAED,eAAe;IACf,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACtC,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAA;QAEhD,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3C,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,UAAsB,EACtB,QAAkB;IAElB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAElE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAC,EAAE,EAAE;QAC/D,IAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAM,CAAC,4CAA4C;QACrD,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,OAAO,gBAAgB,CACrB,UAAU,EACV,KAAK,CACN,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,UAAsB,EACtB,QAAkB,EAClB,SAA4B,EAAE;IAE9B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;IAChC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAA;IAChC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAC9B,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,KAAK,QAAQ,CAAC,eAAe,CAAC,SAAS,CACxF,CAAA;IAED,IAAG,WAAW,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC;YACV,UAAU;YACV,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAA;IACJ,CAAC;IAED,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,mBAAmB,CACvD,KAAK,EACL,QAAQ,EACR,MAAM,CACP,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC"}

package/js/state/providers.d.ts

@@ -1,8 +1,9 @@
-import { TagSupport } from '../TagSupport.class';
+import { TagSupport } from '../tag/TagSupport.class';
 export type Provider = {
     constructMethod: any;
     instance: any;
     clone: any;
+    stateDiff: number;
 };
 type ProviderConstructor<T> = (new (...args: any[]) => T) | (() => T);
 export type ProviderConfig = {
@@ -11,8 +12,9 @@ export type ProviderConfig = {
 };
 type functionProvider<T> = () => T;
 type classProvider<T> = new (...args: any[]) => T;
+type Construct<T> = classProvider<T> | functionProvider<T>;
 export declare const providers: {
-    create: <T>(constructMethod: classProvider<T> | functionProvider<T>) => T;
+    create: <T>(constructMethod: Construct<T>) => T;
     /**
      * @template T
      * @param {(new (...args: any[]) => T) | () => T} constructor

package/js/state/providers.js

@@ -5,35 +5,40 @@ setUse.memory.providerConfig = {
     providers: [],
     ownerSupport: undefined,
 };
-function get(constructMethod) {
-    const config = setUse.memory.providerConfig;
-    const providers = config.providers;
-    return providers.find(provider => provider.constructMethod === constructMethod);
-}
 export const providers = {
     create: (constructMethod) => {
-        const existing = get(constructMethod);
-        if (existing) {
-            existing.clone = deepClone(existing.instance);
-            // fake calling state the same number of previous times
-            for (let x = 0; x < existing.stateDiff; ++x) {
-                state(existing.stateDiff);
+        const cm = constructMethod;
+        const compareTo = cm.compareTo = cm.compareTo || cm.toString();
+        const stateDiffMemory = state(() => ({ stateDiff: 0, provider: undefined }));
+        if (stateDiffMemory.stateDiff) {
+            for (let x = stateDiffMemory.stateDiff; x > 0; --x) {
+                state(undefined);
             }
-            return state(existing.stateDiff);
+            const result = state(undefined);
+            stateDiffMemory.provider.constructMethod.compareTo = compareTo;
+            return result;
         }
-        const oldStateCount = setUse.memory.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 stateDiff = setUse.memory.stateConfig.array.length - oldStateCount;
-        const config = setUse.memory.providerConfig;
-        config.providers.push({
-            constructMethod,
-            instance,
-            clone: deepClone(instance),
-            stateDiff,
+        const result = state(() => {
+            const memory = setUse.memory;
+            const stateConfig = memory.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 stateDiff = stateConfig.array.length - oldStateCount;
+            const config = memory.providerConfig;
+            const provider = {
+                constructMethod,
+                instance,
+                clone: deepClone(instance),
+                stateDiff,
+            };
+            stateDiffMemory.provider = provider;
+            config.providers.push(provider);
+            stateDiffMemory.stateDiff = stateDiff;
+            return instance;
         });
-        state(() => instance); // tie provider to a state for rendering change checking
-        return instance;
+        stateDiffMemory.provider.constructMethod.compareTo = compareTo;
+        return result;
     },
     /**
      * @template T
@@ -41,31 +46,33 @@ export const providers = {
      * @returns {T}
      */
     inject: (constructor) => {
-        const oldValue = get(constructor);
-        if (oldValue) {
-            return oldValue.instance;
-        }
-        const config = setUse.memory.providerConfig;
-        let owner = {
-            ownerTagSupport: config.ownerSupport
-        };
-        while (owner.ownerTagSupport) {
-            const ownerProviders = owner.ownerTagSupport.global.providers;
-            const provider = ownerProviders.find(provider => {
-                if (provider.constructMethod === constructor) {
-                    return true;
+        // find once, return same every time after
+        return state(() => {
+            const config = setUse.memory.providerConfig;
+            const cm = constructor;
+            const compareTo = cm.compareTo = cm.compareTo || constructor.toString();
+            let owner = {
+                ownerTagSupport: config.ownerSupport
+            };
+            while (owner.ownerTagSupport) {
+                const ownerProviders = owner.ownerTagSupport.global.providers;
+                const provider = ownerProviders.find(provider => {
+                    const constructorMatch = provider.constructMethod.compareTo === compareTo;
+                    if (constructorMatch) {
+                        return true;
+                    }
+                });
+                if (provider) {
+                    provider.clone = deepClone(provider.instance); // keep a copy of the latest before any change occur
+                    config.providers.push(provider);
+                    return provider.instance;
                 }
-            });
-            if (provider) {
-                provider.clone = deepClone(provider.instance); // keep a copy of the latest before any change occur
-                config.providers.push(provider);
-                return provider.instance;
+                owner = owner.ownerTagSupport; // cause reloop checking next parent
             }
-            owner = owner.ownerTagSupport; // cause reloop
-        }
-        const msg = `Could not inject provider: ${constructor.name} ${constructor}`;
-        console.warn(`${msg}. Available providers`, config.providers);
-        throw new Error(msg);
+            const msg = `Could not inject provider: ${constructor.name} ${constructor}`;
+            console.warn(`${msg}. Available providers`, config.providers);
+            throw new Error(msg);
+        });
     }
 };
 setUse({

package/js/state/providers.js.map

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

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

@@ -1,25 +1,26 @@
-import { BaseTagSupport, TagSupport } from '../TagSupport.class';
+import { BaseTagSupport, TagSupport } from '../tag/TagSupport.class';
 import { ProviderConfig } from './providers';
 import { Config } from './state.utils';
 interface TagUse {
     beforeRender: (tagSupport: BaseTagSupport, ownerTag?: TagSupport) => void;
     beforeRedraw: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
-    afterRender: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
+    afterRender: (tagSupport: BaseTagSupport, ownerTagSupport?: TagSupport) => void;
     beforeDestroy: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
 }
 export type UseOptions = {
     beforeRender?: (tagSupport: BaseTagSupport, ownerTag?: TagSupport) => void;
     beforeRedraw?: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
-    afterRender?: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
+    afterRender?: (tagSupport: BaseTagSupport, ownerTagSupport?: TagSupport) => void;
     beforeDestroy?: (tagSupport: BaseTagSupport, tag: TagSupport) => void;
 };
 export declare function setUse(use: UseOptions): void;
 export declare namespace setUse {
     var tagUse: TagUse[];
-    var memory: Record<string, any> & {
-        stateConfig: Config;
-        providerConfig: ProviderConfig;
-        currentSupport: TagSupport;
-    };
+    var memory: UseMemory;
 }
+type UseMemory = (Record<string, any> & {
+    stateConfig: Config;
+    providerConfig: ProviderConfig;
+    currentSupport: TagSupport;
+});
 export {};

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

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

package/js/state/state.function.js

@@ -1,5 +1,6 @@
 import { setUse } from './setUse.function';
 import { getStateValue } from './state.utils';
+import { syncStates } from './syncStates.function';
 /** Used for variables that need to remain the same variable during render passes */
 export function state(defaultValue) {
     const config = setUse.memory.stateConfig;
@@ -21,6 +22,22 @@ export function state(defaultValue) {
     // 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 tagSupport = config.tagSupport;
+        const original = initValue;
+        initValue = ((...args) => {
+            const global = tagSupport.global;
+            const newest = global.newest;
+            const newState = newest.memory.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),

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

@@ -1 +1 @@
-{"version":3,"file":"state.function.js","sourceRoot":"","sources":["../../ts/state/state.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAA+C,aAAa,EAAE,MAAM,eAAe,CAAA;AAE1F,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,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":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAA+C,aAAa,EAAE,MAAM,eAAe,CAAA;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,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,UAAU,GAAG,MAAM,CAAC,UAAwB,CAAA;QAClD,MAAM,QAAQ,GAAG,SAAS,CAAA;QAE1B,SAAS,GAAG,CAAC,CAAC,GAAG,IAAW,EAAE,EAAE;YAC9B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;YAChC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAoB,CAAA;YAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAA;YAEpC,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"}

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

@@ -1,4 +1,4 @@
-import { BaseTagSupport } from '../TagSupport.class';
+import { BaseTagSupport } from '../tag/TagSupport.class';
 export type StateConfig<T> = (x: T) => [T, T];
 export type StateConfigItem<T> = {
     get: () => T;

package/js/state/state.utils.js

@@ -15,21 +15,24 @@ setUse({
         const rearray = config.rearray;
         if (rearray.length) {
             if (rearray.length !== config.array.length) {
-                const message = `States lengths has changed ${rearray.length} !== ${config.array.length}. Typically occurs when a function is intended to be wrapped with a tag() call`;
+                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 = tagSupport.templater?.wrapper;
                 const details = {
                     oldStates: config.array,
                     newStates: config.rearray,
-                    tagFunction: wrapper.original,
+                    tagFunction: wrapper.parentWrap.original,
                 };
                 const error = new StateMismatchError(message, details);
                 console.warn(message, details);
                 throw error;
             }
         }
+        const cTagConfig = config.tagSupport;
         delete config.rearray; // clean up any previous runs
         delete config.tagSupport;
-        memory.state = config.array; // [...config.array]
+        memory.state.length = 0;
+        memory.state.push(...config.array);
+        // memory.state = config.array // [...config.array]
         memory.state.forEach(item => item.lastValue = getStateValue(item)); // set last values
         config.array = [];
     }
@@ -60,9 +63,11 @@ function initState(tagSupport) {
     const state = memory.state;
     const config = setUse.memory.stateConfig;
     // TODO: This guard may no longer be needed
+    /*
     if (config.rearray) {
-        checkStateMismatch(tagSupport, config, state);
+      checkStateMismatch(tagSupport, config, state)
     }
+    */
     config.rearray = [];
     if (state?.length) {
         state.forEach(state => getStateValue(state));
@@ -70,25 +75,34 @@ function initState(tagSupport) {
     }
     config.tagSupport = tagSupport;
 }
-function checkStateMismatch(tagSupport, config, state) {
-    const wrapper = tagSupport.templater?.wrapper;
-    const wasWrapper = config.tagSupport?.templater.wrapper;
-    const message = 'last state not cleared. Possibly in the middle of rendering one component and another is trying to render';
-    if (!wasWrapper) {
-        return; // its not a component or was not a component before
-    }
-    console.error(message, {
-        config,
-        tagFunction: wrapper.original,
-        wasInMiddleOf: wasWrapper.original,
-        state,
-        expectedClearArray: config.rearray,
-    });
-    throw new StateMismatchError(message, {
-        config,
-        tagFunction: wrapper.original,
-        state,
-        expectedClearArray: config.rearray,
-    });
+/*
+function checkStateMismatch(
+  tagSupport: BaseTagSupport,
+  config: Config,
+  state: State,
+) {
+  const wrapper = tagSupport.templater?.wrapper as Wrapper
+  const wasWrapper = config.tagSupport?.templater.wrapper as Wrapper
+  const message = 'last state not cleared. Possibly in the middle of rendering one component and another is trying to render'
+
+  if(!wasWrapper) {
+    return // its not a component or was not a component before
+  }
+
+  console.error(message, {
+    config,
+    tagFunction: wrapper.parentWrap.original,
+    wasInMiddleOf: wasWrapper.parentWrap.original,
+    state,
+    expectedClearArray: config.rearray,
+  })
+
+  throw new StateMismatchError(message, {
+    config,
+    tagFunction: wrapper.parentWrap.original,
+    state,
+    expectedClearArray: config.rearray,
+  })
 }
+*/
 //# sourceMappingURL=state.utils.js.map

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":"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"}

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

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

package/js/state/syncStates.function.js

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

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

@@ -0,0 +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,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACjC,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,CAAC,CAAA;AACJ,CAAC"}

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

@@ -1,8 +1,25 @@
-export type WatchCallback = (currentValues: any[], previousValues: any[] | undefined) => unknown | ((currentValues: any[]) => unknown) | (() => unknown);
+import { Subject } from '../subject';
+export type WatchCallback<T> = (currentValues: any[], previousValues: any[] | undefined) => T | ((currentValues: any[]) => T) | (() => T);
+type WatchOperators<T> = {
+    setup: WatchSetup<T>;
+    /** When an item in watch array changes, callback function will be triggered. Does not trigger on initial watch setup. */
+    noInit: (<T>(currentValues: any[], callback: WatchCallback<T>) => T | undefined) & MasterWatch<T>;
+    /** When an item in watch array changes, callback function will be triggered */
+    asSubject: (<T>(currentValues: any[], callback: WatchCallback<T>) => Subject<T>) & MasterWatch<T>;
+    /** When an item in watch array changes and all values are truthy then callback function will be triggered */
+    truthy: (<T>(currentValues: any[], callback: WatchCallback<T>) => T | undefined) & MasterWatch<T>;
+};
+type MasterWatch<T> = ((currentValues: any[], callback: WatchCallback<T>) => T) & WatchOperators<T>;
 /**
- * When an item in watch array changes, callback function will be triggered. Does not trigger on initial watch setup.
+ * When an item in watch array changes, callback function will be triggered. Triggers on initial watch setup. TIP: try watch.noInit()
  * @param currentValues T[]
  * @param callback WatchCallback
  * @returns T[]
  */
-export declare function watch<T>(currentValues: T[], callback: WatchCallback): T[];
+export declare const watch: MasterWatch<any>;
+type WatchSetup<R> = {
+    init?: (currentValues: any[], previousValues: any[]) => R;
+    final?: (x: any) => any;
+    before?: (currentValues: any[]) => boolean;
+};
+export {};

package/js/state/watch.function.js

@@ -1,25 +1,121 @@
-import { letState } from './letState.function';
+import { ValueSubject } from '../subject';
+import { getSupportInCycle } from '../tag/getSupportInCycle.function';
+import { setUse } from './setUse.function';
+import { state } from './state.function';
+import { syncStates } from './syncStates.function';
 /**
- * When an item in watch array changes, callback function will be triggered. Does not trigger on initial watch setup.
+ * When an item in watch array changes, callback function will be triggered. Triggers on initial watch setup. TIP: try watch.noInit()
  * @param currentValues T[]
  * @param callback WatchCallback
  * @returns T[]
  */
-export function watch(currentValues, callback) {
-    let previousValues = letState(undefined)(x => [previousValues, previousValues = x]);
+export const watch = ((currentValues, callback) => {
+    return setupWatch(currentValues, callback);
+});
+const defaultFinally = (x) => x;
+function newWatch(setup) {
+    const method = (currentValues, callback) => {
+        return setupWatch(currentValues, callback, setup);
+    };
+    method.setup = setup;
+    defineOnMethod(() => method, method);
+    return method;
+}
+/**
+ * puts above functionality together
+ * @param currentValues values being watched
+ * @param callback (currentValue, previousValues) => resolveToValue
+ * @param param2
+ * @returns
+ */
+const setupWatch = (currentValues, callback, { init, before = () => true, final = defaultFinally, } = {}) => {
+    let previous = state({
+        pastResult: undefined,
+        values: undefined,
+    });
+    const previousValues = previous.values;
     // First time running watch?
     if (previousValues === undefined) {
-        // callback(currentValues, previousValues) // do not call during init
-        previousValues = currentValues;
-        return currentValues;
+        if (!before(currentValues)) {
+            previous.values = currentValues;
+            return previous.pastResult; // do not continue
+        }
+        const castedInit = init || callback;
+        const result = castedInit(currentValues, previousValues);
+        previous.pastResult = final(result);
+        previous.values = currentValues;
+        return previous.pastResult;
     }
     const allExact = currentValues.every((item, index) => item === previousValues[index]);
     if (allExact) {
-        return currentValues;
+        return previous.pastResult;
+    }
+    if (!before(currentValues)) {
+        previous.values = currentValues;
+        return previous.pastResult; // do not continue
     }
-    callback(currentValues, previousValues);
+    const result = callback(currentValues, previousValues);
+    previous.pastResult = final(result);
     previousValues.length = 0;
     previousValues.push(...currentValues);
-    return currentValues;
+    return previous.pastResult;
+};
+function defineOnMethod(getWatch, attachTo) {
+    Object.defineProperty(attachTo, 'noInit', {
+        get() {
+            const watch = getWatch();
+            watch.setup.init = () => undefined;
+            return watch;
+        },
+    });
+    Object.defineProperty(attachTo, 'asSubject', {
+        get() {
+            const oldWatch = getWatch();
+            const method = (currentValues, callback) => {
+                const originalState = state(() => getSupportInCycle().memory.state);
+                const subject = state(() => new ValueSubject(undefined));
+                setupWatch(currentValues, (currentValues, previousValues) => {
+                    const setTo = callback(currentValues, previousValues);
+                    if (originalState.length) {
+                        const newestState = setUse.memory.stateConfig.array;
+                        syncStates(newestState, originalState);
+                    }
+                    subject.set(setTo);
+                }, oldWatch.setup);
+                return subject;
+            };
+            method.setup = oldWatch.setup;
+            defineOnMethod(() => method, method);
+            return method;
+            /*
+            method.setup = setup
+          
+            defineOnMethod(() => method as any, method)
+            
+            return method as any
+      
+            
+            const oldWatch = getWatch()
+            const watch = newWatch( oldWatch.setup )
+            // const watch = getWatch()
+            
+            const subject = state(() => new Subject())
+            watch.setup.final = (x: any) => {
+              subject.set(x)
+              return subject
+            }
+            return watch
+            */
+        },
+    });
+    Object.defineProperty(attachTo, 'truthy', {
+        get() {
+            const watch = getWatch();
+            watch.setup.before = (currentValues) => currentValues.every(x => x);
+            return watch;
+        },
+    });
+    return attachTo;
 }
+defineOnMethod(() => newWatch({}), watch);
 //# sourceMappingURL=watch.function.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"watch.function.js","sourceRoot":"","sources":["../../ts/state/watch.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAO9C;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CACnB,aAAkB,EAClB,QAAuB;IAEvB,IAAI,cAAc,GAAG,QAAQ,CAAC,SAAkC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,cAAc,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,CAAA;IAE5G,4BAA4B;IAC5B,IAAG,cAAc,KAAK,SAAS,EAAE,CAAC;QAChC,qEAAqE;QACrE,cAAc,GAAG,aAAa,CAAA;QAC9B,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAM,cAAwB,CAAC,KAAK,CAAC,CAAC,CAAA;IAChG,IAAG,QAAQ,EAAE,CAAC;QACZ,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC,CAAA;IACvC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAA;IACzB,cAAc,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAA;IAErC,OAAO,aAAa,CAAA;AACtB,CAAC"}
+{"version":3,"file":"watch.function.js","sourceRoot":"","sources":["../../ts/state/watch.function.ts"],"names":[],"mappings":"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"}