reactronic 0.22.502 → 0.22.504

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

@@ -9,7 +9,7 @@ export declare abstract class ObservableCollection<T> extends ObservableObject i
     get isMergeInProgress(): boolean;
     lookup(key: string): Item<T> | undefined;
     claim(key: string): Item<T> | undefined;
-    add(self: T): Item<T>;
+    add(instance: T): Item<T>;
     remove(item: Item<T>): void;
     move(item: Item<T>, after: Item<T>): void;
     beginMerge(): void;

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

@@ -7,7 +7,7 @@ export class ObservableCollection extends ObservableObject {
     get isMergeInProgress() { return this.impl.isMergeInProgress; }
     lookup(key) { return this.impl.lookup(key); }
     claim(key) { return this.impl.claim(key); }
-    add(self) { return this.impl.add(self); }
+    add(instance) { return this.impl.add(instance); }
     remove(item) { return this.impl.remove(item); }
     move(item, after) { this.impl.move(item, after); }
     beginMerge() { this.impl.beginMerge(); }

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

@@ -7,7 +7,7 @@ export interface CollectionReader<T> {
     readonly isMergeInProgress: boolean;
     lookup(key: string): Item<T> | undefined;
     claim(key: string): Item<T> | undefined;
-    add(self: T): Item<T>;
+    add(instance: T): Item<T>;
     remove(item: Item<T>): void;
     move(item: Item<T>, after: Item<T>): void;
     beginMerge(): void;
@@ -23,7 +23,7 @@ export interface CollectionReader<T> {
     isCurrent(item: Item<T>): boolean;
 }
 export interface Item<T> {
-    readonly self: T;
+    readonly instance: T;
     readonly prev?: Item<T>;
     aux?: Item<T>;
 }
@@ -45,8 +45,8 @@ export declare class Collection<T> implements CollectionReader<T> {
     lookup(key: string | undefined): Item<T> | undefined;
     claim(key: string, resolution?: {
         isDuplicate: boolean;
-    }): Item<T> | undefined;
-    add(self: T): Item<T>;
+    }, error?: string): Item<T> | undefined;
+    add(instance: T): Item<T>;
     remove(item: Item<T>): void;
     move(item: Item<T>, after: Item<T>): void;
     beginMerge(): void;
@@ -61,5 +61,5 @@ export declare class Collection<T> implements CollectionReader<T> {
     isRemoved(item: Item<T>): boolean;
     isCurrent(item: Item<T>): boolean;
     markAsMoved(item: Item<T>): void;
-    static createItem<T>(self: T): Item<T>;
+    static createItem<T>(instance: T): Item<T>;
 }

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

@@ -27,7 +27,7 @@ export class Collection {
         if (key !== undefined && key !== this.lastNotFoundKey) {
             result = this.map.get(key);
             if (result) {
-                if (this.getKey(result.self) !== key) {
+                if (this.getKey(result.instance) !== key) {
                     this.lastNotFoundKey = key;
                     result = undefined;
                 }
@@ -37,12 +37,12 @@ export class Collection {
         }
         return result;
     }
-    claim(key, resolution) {
+    claim(key, resolution, error) {
         const tag = this.tag;
         if (tag < 0)
-            throw new Error('merge is not in progress');
+            throw new Error(error !== null && error !== void 0 ? error : 'merge is not in progress');
         let item = this.strictNextItem;
-        if (key !== (item ? this.getKey(item.self) : undefined))
+        if (key !== (item ? this.getKey(item.instance) : undefined))
             item = this.lookup(key);
         if (item) {
             if (item.tag !== tag) {
@@ -58,14 +58,14 @@ export class Collection {
             else if (resolution)
                 resolution.isDuplicate = true;
             else
-                throw new Error(`duplicate item: ${key}`);
+                throw new Error(`duplicate collection item: ${key}`);
         }
         else if (resolution)
             resolution.isDuplicate = false;
         return item;
     }
-    add(self) {
-        const key = this.getKey(self);
+    add(instance) {
+        const key = this.getKey(instance);
         if (this.lookup(key) !== undefined)
             throw new Error(`key is already in use: ${key}`);
         let tag = this.tag;
@@ -73,7 +73,7 @@ export class Collection {
             tag = ~this.tag + 1;
             this.tag = ~tag;
         }
-        const item = new ItemImpl(self, tag);
+        const item = new ItemImpl(instance, tag);
         this.map.set(key, item);
         this.lastNotFoundKey = undefined;
         this.strictNextItem = undefined;
@@ -111,12 +111,12 @@ export class Collection {
                 if (currentCount > this.removed.count) {
                     const map = this.map;
                     for (const x of this.removed.items())
-                        map.delete(getKey(x.self));
+                        map.delete(getKey(x.instance));
                 }
                 else {
                     const map = this.map = new Map();
                     for (const x of this.current.items())
-                        map.set(getKey(x.self), x);
+                        map.set(getKey(x.instance), x);
                 }
             }
             else
@@ -126,7 +126,7 @@ export class Collection {
             this.current.grab(this.removed, true);
             const getKey = this.getKey;
             for (const x of this.added.itemsViaAux()) {
-                this.map.delete(getKey(x.self));
+                this.map.delete(getKey(x.instance));
                 this.current.exclude(x);
             }
             this.added.reset();
@@ -196,13 +196,13 @@ export class Collection {
         if (t.tag > 0)
             t.status = t.tag;
     }
-    static createItem(self) {
-        return new ItemImpl(self, 0);
+    static createItem(instance) {
+        return new ItemImpl(instance, 0);
     }
 }
 class ItemImpl {
-    constructor(self, tag) {
-        this.self = self;
+    constructor(instance, tag) {
+        this.instance = instance;
         this.tag = tag;
         this.status = ~tag;
         this.next = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.22.502",
+  "version": "0.22.504",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "18.7.18",
-    "@types/react": "18.0.20",
-    "@typescript-eslint/eslint-plugin": "5.37.0",
-    "@typescript-eslint/parser": "5.37.0",
+    "@types/node": "18.11.9",
+    "@types/react": "18.0.25",
+    "@typescript-eslint/eslint-plugin": "5.42.1",
+    "@typescript-eslint/parser": "5.42.1",
     "ava": "4.3.3",
     "c8": "7.12.0",
-    "eslint": "8.23.1",
+    "eslint": "8.27.0",
     "react": "18.2.0",
     "ts-node": "10.9.1",
-    "typescript": "4.8.2"
+    "typescript": "4.8.4"
   },
   "scripts": {
     "build": "eslint source/**/*.ts test/**/*.ts react/**/*.tsx && tsc",