taggedjs 2.8.43 → 3.0.2

package/js/state/watch.function.js

@@ -1,5 +1,6 @@
 import { ValueSubject } from '../subject/index.js';
-import { getSupportInCycle } from '../tag/getSupportInCycle.function.js';
+import { tag } from '../tag/index.js';
+import { getSupportInCycle } from '../tag/cycles/getSupportInCycle.function.js';
 import { setUseMemory } from './setUseMemory.object.js';
 import { state } from './state.function.js';
 import { oldSyncStates } from './syncStates.function.js';
@@ -11,12 +12,12 @@ import { oldSyncStates } from './syncStates.function.js';
  * @returns T[]
  */
 export const watch = ((currentValues, callback) => {
-    return setupWatch(currentValues, callback);
+    return setupWatch(currentValues, callback).pastResult;
 });
 const defaultFinally = (x) => x;
 function newWatch(setup) {
     const method = (currentValues, callback) => {
-        return setupWatch(currentValues, callback, setup);
+        return setupWatch(currentValues, callback, setup).pastResult;
     };
     method.setup = setup;
     defineOnMethod(() => method, method);
@@ -34,32 +35,50 @@ const setupWatch = (currentValues, callback, { init, before, final = defaultFina
         pastResult: undefined,
         values: undefined,
     });
-    const previousValues = previous.values;
-    // First time running watch?
-    if (previousValues === undefined) {
-        if (before && !before(currentValues)) {
-            previous.values = currentValues;
-            return previous.pastResult; // do not continue
+    const isFun = typeof (currentValues) === 'function';
+    const realValues = isFun ? currentValues() : currentValues;
+    const isFirstRender = previous.values === undefined;
+    let renderCount = 0;
+    if (isFirstRender) {
+        if (typeof (currentValues) === 'function') {
+            tag.onRender(() => {
+                ++renderCount;
+                if (renderCount === 1) {
+                    return; // first run is already performed
+                }
+                const realValues = currentValues();
+                processRealValues(realValues);
+            });
         }
-        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 previous.pastResult;
     }
-    if (before && !before(currentValues)) {
-        previous.values = currentValues;
-        return previous.pastResult; // do not continue
+    function processRealValues(realValues) {
+        // First time running watch?
+        if (previous.values === undefined) {
+            if (before && !before(realValues)) {
+                previous.values = realValues;
+                return previous; // do not continue
+            }
+            const castedInit = init || callback;
+            const result = castedInit(realValues, previous.values);
+            previous.pastResult = final(result);
+            previous.values = realValues;
+            return previous;
+        }
+        const allExact = realValues.every((item, index) => item === previous.values[index]);
+        if (allExact) {
+            return previous;
+        }
+        if (before && !before(realValues)) {
+            previous.values = realValues;
+            return previous; // do not continue
+        }
+        const result = callback(realValues, previous.values);
+        previous.pastResult = final(result);
+        previous.values.length = 0;
+        previous.values.push(...realValues);
+        return previous;
     }
-    const result = callback(currentValues, previousValues);
-    previous.pastResult = final(result);
-    previousValues.length = 0;
-    previousValues.push(...currentValues);
-    return previous.pastResult;
+    return processRealValues(realValues);
 };
 function defineOnMethod(getWatch, attachTo) {
     Object.defineProperty(attachTo, 'noInit', {
@@ -73,26 +92,32 @@ function defineOnMethod(getWatch, attachTo) {
         get() {
             const oldWatch = getWatch();
             const firstSupport = state(() => getSupportInCycle());
-            const subject = state(() => new ValueSubject(undefined));
+            const subject = state(() => {
+                return new ValueSubject(undefined);
+            });
             const oldState = state(() => ({
-                stateArray: setUseMemory.stateConfig.stateArray,
+                state: setUseMemory.stateConfig.state,
                 states: setUseMemory.stateConfig.states,
             }));
             const method = (currentValues, callback) => {
-                setupWatch(currentValues, (currentValues, previousValues) => {
+                const handler = (realValues, previousValues) => {
                     const nowSupport = getSupportInCycle();
-                    const setTo = callback(currentValues, previousValues);
+                    const setTo = callback(realValues, previousValues);
                     if (nowSupport !== firstSupport) {
-                        const newestState = oldState.stateArray;
-                        const global = firstSupport.context.global;
-                        const oldest = global.oldest;
-                        const oldestState = oldest.state;
-                        const newStates = oldState.states;
-                        const oldStates = oldest.states;
-                        oldSyncStates(newestState, oldestState, newStates, oldStates);
+                        const newestState = oldState.state;
+                        const context = firstSupport.context;
+                        const stateMeta = context.state;
+                        const oldestStateSupport = stateMeta.older;
+                        if (oldestStateSupport) {
+                            const oldestState = oldestStateSupport.state;
+                            const newStates = oldState.states;
+                            const oldStates = oldestStateSupport.states;
+                            oldSyncStates(newestState, oldestState, newStates, oldStates);
+                        }
                     }
                     subject.next(setTo);
-                }, oldWatch.setup);
+                };
+                setupWatch(currentValues, handler, oldWatch.setup);
                 return subject;
             };
             method.setup = oldWatch.setup;

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

@@ -1,20 +1,23 @@
-import { UnaryFunction as OperatorFunction, SubjectLike, SubjectSubscriber, Subscription } from './subject.utils.js';
+import { LikeObservable } from '../tagJsVars/processSubscribeWithAttribute.function.js';
+import { UnaryFunction as OperatorFunction, SubjectSubscriber, Subscription } from './subject.utils.js';
 export type OnSubscription<T> = (subscription: Subscription<T>) => unknown;
-export declare class Subject<T> implements SubjectLike<T> {
-    value?: T | undefined;
+export declare class Subject<T> implements LikeObservable<T> {
     onSubscription?: OnSubscription<T> | undefined;
     methods: OperatorFunction<any, any, any>[];
     isSubject: boolean;
     subscribers: Subscription<T>[];
     subscribeWith?: (x: SubjectSubscriber<T>) => Subscription<T>;
-    constructor(value?: T | undefined, onSubscription?: OnSubscription<T> | undefined);
-    subscribe(callback: SubjectSubscriber<T>): Subscription<any> | Subscription<T>;
+    value?: any;
+    constructor(value?: T, onSubscription?: OnSubscription<T> | undefined);
+    subscribe(callback: SubjectSubscriber<T>): Subscription<T> | Subscription<any>;
     next(value?: T): void;
     set: (value?: T) => void;
     emit(): void;
     toPromise(): Promise<T>;
-    /** like toPromise but faster. Only get called once. No subscription to manage */
-    toCallback(callback: (x: T) => any): this;
+    /** like toPromise but faster.
+     * Once called, unsubscribe occurs.
+     * No subscription to manage UNLESS the callback will never occur THEN subscription needs to be closed with result.unsubscribe() */
+    toCallback(callback: (x: T) => any): Subscription<T> | Subscription<any>;
     pipe(): Subject<T>;
     pipe<A, RESOLVE>(op1: OperatorFunction<T, A, RESOLVE>): Subject<A>;
     pipe<A, B, RESOLVE>(op1: OperatorFunction<T, A, RESOLVE>, op2: OperatorFunction<A, B, RESOLVE>): Subject<B>;
@@ -28,19 +31,17 @@ export declare class Subject<T> implements SubjectLike<T> {
     pipe<A, B, C, D, E, F, G, H, I, RESOLVE>(op1: OperatorFunction<T, A, RESOLVE>, op2: OperatorFunction<A, B, RESOLVE>, op3: OperatorFunction<B, C, RESOLVE>, op4: OperatorFunction<C, D, RESOLVE>, op5: OperatorFunction<D, E, RESOLVE>, op6: OperatorFunction<E, F, RESOLVE>, op7: OperatorFunction<F, G, RESOLVE>, op8: OperatorFunction<G, H, RESOLVE>, op9: OperatorFunction<H, I, RESOLVE>, ...operations: OperatorFunction<any, any, any>[]): Subject<unknown>;
     setMethods(operations: OperatorFunction<any, any, any>[]): void;
     /** Wait for all observables to emit before continuing */
-    static all<A, B, C, D, E, F>(args: [Subject<A> | A, Subject<B> | B, Subject<C> | C, Subject<D> | D, Subject<E> | E, Subject<F> | F]): Subject<[A, B, C, D, E, F]>;
-    static all<A, B, C, D, E>(args: [Subject<A> | A, Subject<B> | B, Subject<C> | C, Subject<D> | D, Subject<E> | E]): Subject<[A, B, C, D, E]>;
-    static all<A, B, C, D>(args: [Subject<A> | A, Subject<B> | B, Subject<C> | C, Subject<D> | D]): Subject<[A, B, C, D]>;
-    static all<A, B, C>(args: [Subject<A> | A, Subject<B> | B, Subject<C> | C]): Subject<[A, B, C]>;
-    static all<A, B>(args: [Subject<A> | A, Subject<B> | B]): Subject<[A, B]>;
-    static all<A>(args: [Subject<A> | A]): Subject<[A]>;
+    static all<A, B, C, D, E, F>(args: [LikeObservable<A> | A, LikeObservable<B> | B, LikeObservable<C> | C, LikeObservable<D> | D, LikeObservable<E> | E, LikeObservable<F> | F]): Subject<[A, B, C, D, E, F]>;
+    static all<A, B, C, D, E>(args: [LikeObservable<A> | A, LikeObservable<B> | B, LikeObservable<C> | C, LikeObservable<D> | D, LikeObservable<E> | E]): Subject<[A, B, C, D, E]>;
+    static all<A, B, C, D>(args: [LikeObservable<A> | A, LikeObservable<B> | B, LikeObservable<C> | C, LikeObservable<D> | D]): Subject<[A, B, C, D]>;
+    static all<A, B, C>(args: [LikeObservable<A> | A, LikeObservable<B> | B, LikeObservable<C> | C]): Subject<[A, B, C]>;
+    static all<A, B>(args: [LikeObservable<A> | A, LikeObservable<B> | B]): Subject<[A, B]>;
+    static all<A>(args: [LikeObservable<A> | A]): Subject<[A]>;
     static globalSubCount$: Subject<number>;
 }
 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);
+    constructor(...args: [value?: T, onSubscription?: OnSubscription<T>]);
     next(value?: any): void;
     emit(): void;
 }

package/js/subject/Subject.class.js

@@ -2,7 +2,6 @@ import { isSubjectInstance } from '../isInstance.js';
 import { combineLatest } from './combineLatest.function.js';
 import { getSubscription, runPipedMethods } from './subject.utils.js';
 export class Subject {
-    value;
     onSubscription;
     // private?
     methods = [];
@@ -10,12 +9,15 @@ export class Subject {
     // private?
     subscribers = [];
     subscribeWith;
+    value;
     constructor(value, 
     // private? - only used by extending classes
     onSubscription) {
-        this.value = value;
         this.onSubscription = onSubscription;
         // defineValueOn(this)
+        if (arguments.length > 0) {
+            this.value = value;
+        }
     }
     subscribe(callback) {
         const subscription = getSubscription(this, callback, this.subscribers);
@@ -60,7 +62,9 @@ export class Subject {
             });
         });
     }
-    /** like toPromise but faster. Only get called once. No subscription to manage */
+    /** like toPromise but faster.
+     * Once called, unsubscribe occurs.
+     * No subscription to manage UNLESS the callback will never occur THEN subscription needs to be closed with result.unsubscribe() */
     toCallback(callback) {
         const subscription = this.subscribe((x, runtimeSub) => {
             const tagJsUnsub = runtimeSub?.unsubscribe;
@@ -72,10 +76,15 @@ export class Subject {
             }
             callback(x);
         });
-        return this;
+        // return this 10-2025 remove
+        return subscription;
     }
     pipe(...operations) {
-        const subject = new Subject(this.value);
+        const args = [];
+        if ('value' in this) {
+            args.push(this.value);
+        }
+        const subject = new Subject(...args);
         subject.setMethods(operations);
         subject.subscribeWith = (x) => this.subscribe(x);
         subject.next = x => this.next(x);
@@ -100,16 +109,10 @@ export class Subject {
     static globalSubCount$ = new Subject(0); // for ease of debugging}
 }
 export class Subjective extends Subject {
-    value;
-    onSubscription;
     _value;
-    constructor(value, 
-    // private?
-    onSubscription) {
-        super(value, onSubscription);
-        this.value = value;
-        this.onSubscription = onSubscription;
-        this._value = value;
+    constructor(...args) {
+        super(...args);
+        this._value = args[0];
         defineValueOn(this);
     }
     next(value) {

package/js/subject/Subject.class.js.map

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

package/js/tag/AdvancedContextItem.type.d.ts

@@ -1,3 +1,2 @@
 import { ContextItem } from './ContextItem.type.js';
-export interface AdvancedContextItem extends ContextItem {
-}
+export type AdvancedContextItem = ContextItem;

package/js/tag/AnySupport.type.d.ts

@@ -1,7 +1,5 @@
-import { State } from '../state/index.js';
-import { StatesSetter } from '../state/states.utils.js';
-import { BaseSupport } from './BaseSupport.type.js';
-export type AnySupport = (BaseSupport & {
-    state: State;
-    states: StatesSetter[];
-});
+import { HtmlSupport } from './createHtmlSupport.function.js';
+import { SupportContextItem } from './SupportContextItem.type.js';
+export type AnySupport = HtmlSupport & {
+    context: SupportContextItem;
+};

package/js/tag/AttributeContextItem.type.d.ts

@@ -0,0 +1,16 @@
+import { HowToSet } from '../interpolations/attributes/howToSetInputValue.function.js';
+import { AnySupport } from '../index.js';
+import { SpecialDefinition } from '../render/attributes/Special.types.js';
+import { BaseContextItem } from './ContextItem.type.js';
+export interface AttributeContextItem extends BaseContextItem {
+    isAttr?: true;
+    howToSet?: HowToSet;
+    isNameOnly?: boolean;
+    attrName?: string;
+    isSpecial?: SpecialDefinition;
+    stateOwner?: AnySupport;
+    supportOwner?: AnySupport;
+}
+export interface HostAttributeContextItem extends AttributeContextItem {
+    state: any;
+}

package/js/tag/AttributeContextItem.type.js

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

package/js/tag/AttributeContextItem.type.js.map

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

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

@@ -1,9 +1,9 @@
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
 import { TemplateValue } from './TemplateValue.type.js';
 import { ContextItem } from './ContextItem.type.js';
 import { SupportContextItem } from './SupportContextItem.type.js';
-import { TagCounts } from './TagCounts.type.js';
-export type ContextHandler = (value: TemplateValue, newSupport: AnySupport, contextItem: ContextItem, values: unknown[], counts: TagCounts) => void;
+export type ContextHandler = (value: TemplateValue, newSupport: AnySupport, contextItem: ContextItem, values: unknown[]) => void;
 export type LastArrayItem = ContextItem;
-export type CheckValueChange = (value: unknown, subject: ContextItem, counts: TagCounts, ownerSupport: AnySupport) => number | boolean;
-export type CheckSupportValueChange = (value: unknown, subject: SupportContextItem, counts: TagCounts) => number | boolean;
+/** Return 0 if no change. Any other number tells what changed */
+export type HasValueChanged = (value: unknown, context: ContextItem, ownerSupport: AnySupport) => number;
+export type CheckSupportValueChange = (value: unknown, contextItem: SupportContextItem) => number;

package/js/tag/ContextItem.type.d.ts

@@ -1,26 +1,43 @@
-import { HowToSet } from '../interpolations/attributes/howToSetInputValue.function.js';
 import { Clone, TagGlobal } from './getTemplaterResult.function.js';
 import { SubContext } from './update/SubContext.type.js';
 import { PaintCommand } from '../render/paint.function.js';
-import { LastArrayItem } from '../index.js';
+import { Events, LastArrayItem, Subject } from '../index.js';
 import { TagJsVar } from '../tagJsVars/tagJsVar.type.js';
-import { SpecialDefinition } from '../render/attributes/Special.types.js';
-export interface ContextItem {
-    locked?: true;
-    /** handler(value,newSupport,contextItem,values) Called on value update detected, within processUpdateOneContext(). Return value is ignored */
+import { ContextStateMeta } from './ContextStateMeta.type.js';
+import { DomObjectChildren } from '../interpolations/optimizers/ObjectNode.types.js';
+export interface AppContextItem {
+    /** automatically updated with every update */
+    value?: any;
+    /** Not updated automatically. processUpdate has the option to set this value */
+    tagJsVar: TagJsVar;
+    updateCount: number;
+    returnValue?: any;
+    state?: ContextStateMeta;
+    htmlDomMeta?: DomObjectChildren;
+    /** only for html`` . When -1 then its a raw bolt value */
+    valueIndex: number;
+    /** TODO: is this deprecated? */
+    oldTagJsVar?: TagJsVar;
+    subContext?: SubContext;
+    withinOwnerElement: boolean;
+    destroy$: Subject<void>;
+    render$: Subject<void>;
+    events?: Events;
+}
+export interface BaseContextItem extends AppContextItem {
+    element?: HTMLElement;
+    parentContext: BaseContextItem;
     isAttr?: true;
-    howToSet?: HowToSet;
-    isNameOnly?: boolean;
-    attrName?: string;
-    isSpecial?: SpecialDefinition;
+    isAttrs?: true;
+    contexts?: ContextItem[];
+}
+export interface ContextItem extends BaseContextItem {
+    /** number represent reason for the lock */
+    locked?: number;
+    deleted?: true;
     simpleValueElm?: Clone;
     paint?: PaintCommand;
     lastArray?: LastArrayItem[];
-    subContext?: SubContext;
-    value?: any;
-    tagJsVar: TagJsVar;
     global?: TagGlobal;
-    element?: Element;
     placeholder?: Text;
-    withinOwnerElement: boolean;
 }

package/js/tag/ContextStateMeta.type.d.ts

@@ -0,0 +1,13 @@
+import { AnySupport } from '../index.js';
+import { State } from '../state/index.js';
+import { StatesSetter } from '../state/states.utils.js';
+export interface ContextStateSupport {
+    state: State;
+    states: StatesSetter[];
+}
+export interface ContextStateMeta {
+    oldest?: AnySupport;
+    newest?: AnySupport;
+    older?: ContextStateSupport;
+    newer?: ContextStateSupport;
+}

package/js/tag/ContextStateMeta.type.js

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

package/js/tag/ContextStateMeta.type.js.map

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

package/js/tag/ProcessInit.type.d.ts

@@ -1,5 +1,10 @@
-import type { TagCounts } from './TagCounts.type.js';
 import { ContextItem } from './ContextItem.type.js';
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
+import { AttributeContextItem } from './AttributeContextItem.type.js';
+import { TagJsVar } from '../tagJsVars/tagJsVar.type.js';
+import { HowToSet } from '../interpolations/attributes/howToSetInputValue.function.js';
 export type ProcessInit = (value: any, // TemplateValue | StringTag | SubscribeValue | SignalObject,
-contextItem: ContextItem, ownerSupport: AnySupport, counts: TagCounts, appendTo?: Element, insertBefore?: Text) => any;
+contextItem: ContextItem, ownerSupport: AnySupport, insertBefore?: Text, appendTo?: Element) => any;
+export type ProcessAttribute = (name: string, value: any, // TemplateValue | StringTag | SubscribeValue | SignalObject,
+element: HTMLElement, tagJsVar: TagJsVar, contextItem: AttributeContextItem, ownerSupport: AnySupport, // may not be needed?
+howToSet: HowToSet) => any;

package/js/tag/ProcessUpdate.type.d.ts

@@ -1,5 +1,5 @@
 import { ContextItem } from './ContextItem.type.js';
-import { AnySupport } from './AnySupport.type.js';
-import { TagCounts } from './TagCounts.type.js';
+import { AnySupport } from './index.js';
 import { TemplateValue } from './TemplateValue.type.js';
-export type ProcessUpdate = (value: TemplateValue, ownerSupport: AnySupport, contextItem: ContextItem, counts: TagCounts, values: unknown[]) => any;
+/** After calling this function you must set contextItem.value = value */
+export type ProcessUpdate = (value: TemplateValue, contextItem: ContextItem, ownerSupport: AnySupport, values: unknown[]) => any;

package/js/tag/SupportContextItem.type.d.ts

@@ -1,7 +1,23 @@
-import { AdvancedContextItem } from './AdvancedContextItem.type.js';
+import { ContextItem } from '../index.js';
+import { Provider } from '../state/providers.js';
+import { AppContextItem } from './ContextItem.type.js';
+import { ContextStateMeta } from './ContextStateMeta.type.js';
 import { SupportTagGlobal } from './getTemplaterResult.function.js';
-export interface SupportContextItem extends AdvancedContextItem {
+export interface AppSupportContextItem extends AppContextItem {
     global: SupportTagGlobal;
+    state: ContextStateMeta;
     /** Indicator of re-rending. Saves from double rending something already rendered */
     renderCount: number;
+    varCounter: number;
+}
+export interface SupportContextItem extends ContextItem {
+    providers?: Provider[];
+    varCounter: number;
+    contexts: SupportContextItem[];
+    global: SupportTagGlobal;
+    state: ContextStateMeta;
+    /** Indicator of re-rending. Saves from double rending something already rendered */
+    renderCount: number;
+    /** Argument aka Prop updates */
+    updatesHandler?: (...args: any[]) => any;
 }

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

@@ -1,5 +1,5 @@
 import { TemplaterResult } from './getTemplaterResult.function.js';
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
 import { TagJsTag, TagJsVar } from '../tagJsVars/tagJsVar.type.js';
 export type Tag = TagJsTag & {
     values: unknown[];

package/js/tag/TagMaker.type.d.ts

@@ -1,2 +1,2 @@
 import { AnyTag } from './AnyTag.type.js';
-export type TagMaker<Args extends any[] = any[]> = ((...args: Args) => AnyTag | TagMaker) | ((...args: Args) => (...args: Args) => AnyTag | TagMaker);
+export type TagMaker<Args extends any[] = any[]> = ((...args: Args) => AnyTag | TagMaker | any[]) | ((...args: Args) => (...args: Args) => AnyTag | TagMaker | any[]);

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

@@ -1,4 +1,2 @@
 import { ContextItem } from './ContextItem.type.js';
-export declare function checkArrayValueChange(newValue: unknown, subject: ContextItem): false | 9;
-export declare function destroyArrayContextItem(subject: ContextItem): void;
-export declare function destroyArray(subject: ContextItem, lastArray: any[]): void;
+export declare function checkArrayValueChange(newValue: unknown, subject: ContextItem): 0 | 9;

package/js/tag/checkDestroyPrevious.function.js

@@ -1,21 +1,11 @@
-import { destroyArrayItem } from './update/compareArrayItems.function.js';
 import { isArray } from '../isInstance.js';
+import { destroyArrayContext } from './destroyArrayContext.function.js';
 export function checkArrayValueChange(newValue, subject) {
     // no longer an array?
     if (!isArray(newValue)) {
-        destroyArrayContextItem(subject);
+        destroyArrayContext(subject);
         return 9; // 'array'
     }
-    return false;
-}
-export function destroyArrayContextItem(subject) {
-    const lastArray = subject.lastArray;
-    destroyArray(subject, lastArray);
-}
-export function destroyArray(subject, lastArray) {
-    for (let index = 0; index < lastArray.length; ++index) {
-        destroyArrayItem(lastArray[index]);
-    }
-    delete subject.lastArray;
+    return 0;
 }
 //# sourceMappingURL=checkDestroyPrevious.function.js.map

package/js/tag/checkDestroyPrevious.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkDestroyPrevious.function.js","sourceRoot":"","sources":["../../ts/tag/checkDestroyPrevious.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAK,wCAAwC,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,MAAK,kBAAkB,CAAA;AAGzC,MAAM,UAAU,qBAAqB,CACnC,QAAiB,EACjB,OAAoB;IAEpB,sBAAsB;IACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,uBAAuB,CAAC,OAAO,CAAC,CAAA;QAEhC,OAAO,CAAC,CAAA,CAAC,UAAU;IACrB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAoB;IAEpB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAsB,CAAA;IAChD,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,OAAoB,EACpB,SAAgB;IAEhB,KAAK,IAAI,KAAK,GAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC;QACpD,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC;IAED,OAAO,OAAO,CAAC,SAAS,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"checkDestroyPrevious.function.js","sourceRoot":"","sources":["../../ts/tag/checkDestroyPrevious.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAK,kBAAkB,CAAA;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,MAAM,UAAU,qBAAqB,CACnC,QAAiB,EACjB,OAAoB;IAEpB,sBAAsB;IACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAC5B,OAAO,CAAC,CAAA,CAAC,UAAU;IACrB,CAAC;IAED,OAAO,CAAC,CAAA;AACV,CAAC"}

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

@@ -1,3 +1,3 @@
-import { AnySupport } from './AnySupport.type.js';
+import { AnySupport } from './index.js';
 import { StateMemory } from '../state/StateMemory.type.js';
 export declare function checkStateMismatch(config: StateMemory, support: AnySupport): void;

package/js/tag/checkStateMismatch.function.js

@@ -1,13 +1,13 @@
 import { StateMismatchError } from '../errors.js';
 export function checkStateMismatch(config, support) {
     const rearray = config.rearray;
-    if (rearray.length && rearray.length !== config.stateArray.length) {
+    if (rearray.length && rearray.length !== config.state.length) {
         throwStateMismatch(rearray, support, config);
     }
 }
 const hint = 'State tracking requires same number of state calls on every render. This error typically occurs when a state call is only reachable behind a condition. Also, wrapping tags that have state, with tag(), often helps when tag is only reachable by a condition.';
 function throwStateMismatch(rearray, support, config) {
-    const message = `Saved states between renders are inconsistent. Expected ${rearray.length} states got ${config.stateArray.length}.`;
+    const message = `Saved states between renders are inconsistent. Expected ${rearray.length} states got ${config.state.length}.`;
     const wrapper = support.templater?.wrapper;
     let tagFunction = wrapper;
     if (wrapper?.original) {
@@ -17,7 +17,7 @@ function throwStateMismatch(rearray, support, config) {
         tagFunction = wrapper.original;
     }
     const details = {
-        oldStates: config.stateArray,
+        oldStates: config.state,
         newStates: config.rearray,
         tagFunction,
         templater: support.templater,

package/js/tag/checkStateMismatch.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkStateMismatch.function.js","sourceRoot":"","sources":["../../ts/tag/checkStateMismatch.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGjD,MAAM,UAAU,kBAAkB,CAChC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,OAA2B,CAAA;IAClD,IAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACjE,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;AACH,CAAC;AAED,MAAM,IAAI,GAAG,iQAAiQ,CAAA;AAE9Q,SAAS,kBAAkB,CACzB,OAAc,EACd,OAAmB,EACnB,MAAmB;IAEnB,MAAM,OAAO,GAAG,2DAA2D,OAAO,CAAC,MAAM,eAAe,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAA;IACnI,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,OAAkB,CAAA;IACrD,IAAI,WAAW,GAAuB,OAAO,CAAA;IAE7C,IAAI,OAAe,EAAE,QAAQ,EAAE,CAAC;QAC9B,WAAW,GAAI,OAAe,CAAC,QAAQ,CAAA;IACzC,CAAC;SAAM,IAAG,OAAO,EAAE,QAAQ,EAAE,CAAC;QAC5B,WAAW,GAAG,OAAO,CAAC,QAAoB,CAAA;IAC5C,CAAC;IAED,MAAM,OAAO,GAAG;QACd,SAAS,EAAE,MAAM,CAAC,UAAU;QAC5B,SAAS,EAAE,MAAM,CAAC,OAAO;QACzB,WAAW;QACX,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAA;IACD,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,OAAO,EAAC,OAAO,CAAC,CAAA;IACrD,OAAO,CAAC,KAAK,CAAC,IAAI,EAAC,OAAO,CAAC,CAAA;IAC3B,MAAM,KAAK,CAAA;AACb,CAAC"}
+{"version":3,"file":"checkStateMismatch.function.js","sourceRoot":"","sources":["../../ts/tag/checkStateMismatch.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGjD,MAAM,UAAU,kBAAkB,CAChC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,OAA2B,CAAA;IAClD,IAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC5D,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC;AACH,CAAC;AAED,MAAM,IAAI,GAAG,iQAAiQ,CAAA;AAE9Q,SAAS,kBAAkB,CACzB,OAAc,EACd,OAAmB,EACnB,MAAmB;IAEnB,MAAM,OAAO,GAAG,2DAA2D,OAAO,CAAC,MAAM,eAAe,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAA;IAC9H,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,EAAE,OAAkB,CAAA;IACrD,IAAI,WAAW,GAAuB,OAAO,CAAA;IAE7C,IAAI,OAAe,EAAE,QAAQ,EAAE,CAAC;QAC9B,WAAW,GAAI,OAAe,CAAC,QAAQ,CAAA;IACzC,CAAC;SAAM,IAAG,OAAO,EAAE,QAAQ,EAAE,CAAC;QAC5B,WAAW,GAAG,OAAO,CAAC,QAAoB,CAAA;IAC5C,CAAC;IAED,MAAM,OAAO,GAAG;QACd,SAAS,EAAE,MAAM,CAAC,KAAK;QACvB,SAAS,EAAE,MAAM,CAAC,OAAO;QACzB,WAAW;QACX,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAA;IACD,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,OAAO,EAAC,OAAO,CAAC,CAAA;IACrD,OAAO,CAAC,KAAK,CAAC,IAAI,EAAC,OAAO,CAAC,CAAA;IAC3B,MAAM,KAAK,CAAA;AACb,CAAC"}