reactronic 0.23.112 → 0.23.114

package/build/dist/source/api.d.ts

@@ -1,6 +1,6 @@
 export { all, pause } from './util/Utils.js';
 export { MergeList } from './util/MergeList.js';
-export type { MergeItem, MergeListReader } from './util/MergeList.js';
+export type { MergedItem as MergeItem, MergeListReader } from './util/MergeList.js';
 export { SealedArray } from './util/SealedArray.js';
 export { SealedMap } from './util/SealedMap.js';
 export { SealedSet } from './util/SealedSet.js';

package/build/dist/source/impl/MvccMergeList.d.ts

@@ -1,4 +1,4 @@
-import { MergeList, MergeItem, MergeListReader } from '../util/MergeList.js';
+import { MergeList, MergedItem, MergeListReader } from '../util/MergeList.js';
 import { ObservableObject } from './Mvcc.js';
 export declare abstract class ObservableMergeList<T> extends ObservableObject implements MergeListReader<T> {
     protected abstract impl: MergeList<T>;
@@ -7,20 +7,20 @@ export declare abstract class ObservableMergeList<T> extends ObservableObject im
     get addedCount(): number;
     get removedCount(): number;
     get isMergeInProgress(): boolean;
-    lookup(key: string): MergeItem<T> | undefined;
-    claim(key: string): MergeItem<T> | undefined;
-    add(instance: T): MergeItem<T>;
-    remove(item: MergeItem<T>): void;
-    move(item: MergeItem<T>, after: MergeItem<T>): void;
+    lookup(key: string): MergedItem<T> | undefined;
+    tryMergeAsExisting(key: string): MergedItem<T> | undefined;
+    mergeAsAdded(instance: T): MergedItem<T>;
+    mergeAsRemoved(item: MergedItem<T>): void;
+    move(item: MergedItem<T>, after: MergedItem<T>): void;
     beginMerge(): void;
     endMerge(error?: unknown): void;
     resetAddedAndRemovedLists(): void;
-    lastClaimedItem(): MergeItem<T> | undefined;
-    items(): Generator<MergeItem<T>>;
-    addedItems(reset?: boolean): Generator<MergeItem<T>>;
-    removedItems(reset?: boolean): Generator<MergeItem<T>>;
-    isAdded(item: MergeItem<T>): boolean;
-    isMoved(item: MergeItem<T>): boolean;
-    isRemoved(item: MergeItem<T>): boolean;
-    isCurrent(item: MergeItem<T>): boolean;
+    lastMergedItem(): MergedItem<T> | undefined;
+    items(): Generator<MergedItem<T>>;
+    addedItems(reset?: boolean): Generator<MergedItem<T>>;
+    removedItems(reset?: boolean): Generator<MergedItem<T>>;
+    isAdded(item: MergedItem<T>): boolean;
+    isMoved(item: MergedItem<T>): boolean;
+    isRemoved(item: MergedItem<T>): boolean;
+    isActual(item: MergedItem<T>): boolean;
 }

package/build/dist/source/impl/MvccMergeList.js

@@ -6,19 +6,19 @@ export class ObservableMergeList extends ObservableObject {
     get removedCount() { return this.impl.removedCount; }
     get isMergeInProgress() { return this.impl.isMergeInProgress; }
     lookup(key) { return this.impl.lookup(key); }
-    claim(key) { return this.impl.claim(key); }
-    add(instance) { return this.impl.add(instance); }
-    remove(item) { return this.impl.remove(item); }
+    tryMergeAsExisting(key) { return this.impl.tryMergeAsExisting(key); }
+    mergeAsAdded(instance) { return this.impl.mergeAsAdded(instance); }
+    mergeAsRemoved(item) { return this.impl.mergeAsRemoved(item); }
     move(item, after) { this.impl.move(item, after); }
     beginMerge() { this.impl.beginMerge(); }
     endMerge(error) { this.impl.endMerge(error); }
     resetAddedAndRemovedLists() { this.impl.resetAddedAndRemovedLists(); }
-    lastClaimedItem() { return this.impl.lastClaimedItem(); }
+    lastMergedItem() { return this.impl.lastMergedItem(); }
     items() { return this.impl.items(); }
     addedItems(reset) { return this.impl.addedItems(reset); }
     removedItems(reset) { return this.impl.removedItems(reset); }
     isAdded(item) { return this.impl.isAdded(item); }
     isMoved(item) { return this.impl.isMoved(item); }
     isRemoved(item) { return this.impl.isRemoved(item); }
-    isCurrent(item) { return this.impl.isCurrent(item); }
+    isActual(item) { return this.impl.isActual(item); }
 }

package/build/dist/source/util/MergeList.d.ts

@@ -5,27 +5,27 @@ export interface MergeListReader<T> {
     readonly addedCount: number;
     readonly removedCount: number;
     readonly isMergeInProgress: boolean;
-    lookup(key: string): MergeItem<T> | undefined;
-    claim(key: string): MergeItem<T> | undefined;
-    add(instance: T): MergeItem<T>;
-    remove(item: MergeItem<T>): void;
-    move(item: MergeItem<T>, after: MergeItem<T>): void;
+    lookup(key: string): MergedItem<T> | undefined;
+    tryMergeAsExisting(key: string): MergedItem<T> | undefined;
+    mergeAsAdded(instance: T): MergedItem<T>;
+    mergeAsRemoved(item: MergedItem<T>): void;
+    move(item: MergedItem<T>, after: MergedItem<T>): void;
     beginMerge(): void;
     endMerge(error?: unknown): void;
     resetAddedAndRemovedLists(): void;
-    lastClaimedItem(): MergeItem<T> | undefined;
-    items(): Generator<MergeItem<T>>;
-    addedItems(reset?: boolean): Generator<MergeItem<T>>;
-    removedItems(reset?: boolean): Generator<MergeItem<T>>;
-    isAdded(item: MergeItem<T>): boolean;
-    isMoved(item: MergeItem<T>): boolean;
-    isRemoved(item: MergeItem<T>): boolean;
-    isCurrent(item: MergeItem<T>): boolean;
+    lastMergedItem(): MergedItem<T> | undefined;
+    items(): Generator<MergedItem<T>>;
+    addedItems(reset?: boolean): Generator<MergedItem<T>>;
+    removedItems(reset?: boolean): Generator<MergedItem<T>>;
+    isAdded(item: MergedItem<T>): boolean;
+    isMoved(item: MergedItem<T>): boolean;
+    isRemoved(item: MergedItem<T>): boolean;
+    isActual(item: MergedItem<T>): boolean;
 }
-export interface MergeItem<T> {
+export interface MergedItem<T> {
     readonly instance: T;
-    readonly prev?: MergeItem<T>;
-    aux?: MergeItem<T>;
+    readonly prev?: MergedItem<T>;
+    aux?: MergedItem<T>;
 }
 export declare class MergeList<T> implements MergeListReader<T> {
     readonly getKey: GetMergeItemKey<T>;
@@ -44,24 +44,24 @@ export declare class MergeList<T> implements MergeListReader<T> {
     get addedCount(): number;
     get removedCount(): number;
     get isMergeInProgress(): boolean;
-    lookup(key: string | undefined): MergeItem<T> | undefined;
-    claim(key: string, resolution?: {
+    lookup(key: string | undefined): MergedItem<T> | undefined;
+    tryMergeAsExisting(key: string, resolution?: {
         isDuplicate: boolean;
-    }, error?: string): MergeItem<T> | undefined;
-    add(instance: T): MergeItem<T>;
-    remove(item: MergeItem<T>): void;
-    move(item: MergeItem<T>, after: MergeItem<T>): void;
+    }, error?: string): MergedItem<T> | undefined;
+    mergeAsAdded(instance: T): MergedItem<T>;
+    mergeAsRemoved(item: MergedItem<T>): void;
+    move(item: MergedItem<T>, after: MergedItem<T>): void;
     beginMerge(): void;
     endMerge(error?: unknown): void;
     resetAddedAndRemovedLists(): void;
-    lastClaimedItem(): MergeItem<T> | undefined;
-    items(): Generator<MergeItem<T>>;
-    addedItems(reset?: boolean): Generator<MergeItem<T>>;
-    removedItems(reset?: boolean): Generator<MergeItem<T>>;
-    isAdded(item: MergeItem<T>): boolean;
-    isMoved(item: MergeItem<T>): boolean;
-    isRemoved(item: MergeItem<T>): boolean;
-    isCurrent(item: MergeItem<T>): boolean;
-    markAsMoved(item: MergeItem<T>): void;
-    static createItem<T>(instance: T): MergeItem<T>;
+    lastMergedItem(): MergedItem<T> | undefined;
+    items(): Generator<MergedItem<T>>;
+    addedItems(reset?: boolean): Generator<MergedItem<T>>;
+    removedItems(reset?: boolean): Generator<MergedItem<T>>;
+    isAdded(item: MergedItem<T>): boolean;
+    isMoved(item: MergedItem<T>): boolean;
+    isRemoved(item: MergedItem<T>): boolean;
+    isActual(item: MergedItem<T>): boolean;
+    markAsMoved(item: MergedItem<T>): void;
+    static createItem<T>(instance: T): MergedItem<T>;
 }

package/build/dist/source/util/MergeList.js

@@ -43,7 +43,7 @@ export class MergeList {
         }
         return result;
     }
-    claim(key, resolution, error) {
+    tryMergeAsExisting(key, resolution, error) {
         const tag = this.tag;
         if (tag < 0)
             throw new Error(error !== null && error !== void 0 ? error : 'merge is not in progress');
@@ -70,7 +70,7 @@ export class MergeList {
             resolution.isDuplicate = false;
         return item;
     }
-    add(instance) {
+    mergeAsAdded(instance) {
         const key = this.getKey(instance);
         if (this.lookup(key) !== undefined)
             throw new Error(`key is already in use: ${key}`);
@@ -87,7 +87,7 @@ export class MergeList {
         this.added.aux(item);
         return item;
     }
-    remove(item) {
+    mergeAsRemoved(item) {
         const t = item;
         if (!this.isRemoved(t)) {
             this.current.exclude(t);
@@ -142,7 +142,7 @@ export class MergeList {
         this.removed.reset();
         this.added.reset();
     }
-    lastClaimedItem() {
+    lastMergedItem() {
         return this.current.last;
     }
     *items() {
@@ -193,7 +193,7 @@ export class MergeList {
         const tag = this.tag;
         return tag > 0 ? t.tag < tag : t.tag < tag - 1;
     }
-    isCurrent(item) {
+    isActual(item) {
         const t = item;
         return t.tag === this.tag;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.23.112",
+  "version": "0.23.114",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",