build: publish@4.4.2

build: publish@4.4.2

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on Keep a Changelog and this project adheres to Semantic Versioning.
 
+## [4.4.2] - 2023.07.21
+
+### Fixed
+
+- The pointer of Adapter container's iterator cannot as array to be deconstructed.
+
+### Added
+
+- Add `isAccessible` function to iterators for iterable containers.
+
 ## [4.4.1] - 2023.06.05
 
 ### Fixed

conf/isolate.config.json

@@ -17,37 +17,37 @@
     },
     {
       "name": "vector",
-      "version": "4.4.0",
+      "version": "4.4.2",
       "sourceRoot": "src/container/SequentialContainer/Vector.ts"
     },
     {
       "name": "link-list",
-      "version": "4.4.0",
+      "version": "4.4.2",
       "sourceRoot": "src/container/SequentialContainer/LinkList.ts"
     },
     {
       "name": "deque",
-      "version": "4.4.0",
+      "version": "4.4.2",
       "sourceRoot": "src/container/SequentialContainer/Deque.ts"
     },
     {
       "name": "ordered-set",
-      "version": "4.4.1",
+      "version": "4.4.2",
       "sourceRoot": "src/container/TreeContainer/OrderedSet.ts"
     },
     {
       "name": "ordered-map",
-      "version": "4.4.1",
+      "version": "4.4.2",
       "sourceRoot": "src/container/TreeContainer/OrderedMap.ts"
     },
     {
       "name": "hash-set",
-      "version": "4.4.0",
+      "version": "4.4.2",
       "sourceRoot": "src/container/HashContainer/HashSet.ts"
     },
     {
       "name": "hash-map",
-      "version": "4.4.0",
+      "version": "4.4.2",
       "sourceRoot": "src/container/HashContainer/HashMap.ts"
     }
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sdsl",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "javascript standard data structure library which benchmark against C++ STL",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

src/container/ContainerBase/index.ts

@@ -83,6 +83,7 @@ export abstract class ContainerIterator<T> {
    * console.log(next.pointer, iter.pointer); // 2, 1
    */
   abstract copy(): ContainerIterator<T>;
+  abstract isAccessible(): boolean;
 }
 
 export abstract class Base {

src/container/HashContainer/Base/index.ts

@@ -63,6 +63,9 @@ export abstract class HashContainerIterator<K, V> extends ContainerIterator<K |
       };
     }
   }
+  isAccessible() {
+    return this._node !== this._header;
+  }
   // @ts-ignore
   pre(): this;
   // @ts-ignore

src/container/HashContainer/HashMap.ts

@@ -21,13 +21,16 @@ class HashMapIterator<K, V> extends HashContainerIterator<K, V> {
     }
     const self = this;
     return new Proxy(<[K, V]><unknown>[], {
-      get(_, props: '0' | '1') {
-        if (props === '0') return self._node._key;
-        else if (props === '1') return self._node._value;
+      get(target, prop: '0' | '1') {
+        if (prop === '0') return self._node._key;
+        else if (prop === '1') return self._node._value;
+        target[0] = self._node._key;
+        target[1] = self._node._value;
+        return target[prop];
       },
-      set(_, props: '1', newValue: V) {
-        if (props !== '1') {
-          throw new TypeError('props must be 1');
+      set(_, prop: '1', newValue: V) {
+        if (prop !== '1') {
+          throw new TypeError('prop must be 1');
         }
         self._node._value = newValue;
         return true;

src/container/SequentialContainer/Base/RandomIterator.ts

@@ -55,6 +55,9 @@ export abstract class RandomIterator<T> extends ContainerIterator<T> {
   set pointer(newValue: T) {
     this.container.setElementByPos(this._node, newValue);
   }
+  isAccessible() {
+    return this._node !== this.container.size();
+  }
   // @ts-ignore
   pre(): this;
   // @ts-ignore

src/container/SequentialContainer/LinkList.ts

@@ -79,6 +79,9 @@ class LinkListIterator<T> extends ContainerIterator<T> {
   copy() {
     return new LinkListIterator<T>(this._node, this._header, this.container, this.iteratorType);
   }
+  isAccessible() {
+    return this._node !== this._header;
+  }
   // @ts-ignore
   equals(iter: LinkListIterator<T>): boolean;
   // @ts-ignore

src/container/TreeContainer/Base/TreeIterator.ts

@@ -93,6 +93,9 @@ abstract class TreeIterator<K, V> extends ContainerIterator<K | [K, V]> {
     }
     return index;
   }
+  isAccessible() {
+    return this._node !== this._header;
+  }
   // @ts-ignore
   pre(): this;
   // @ts-ignore

src/container/TreeContainer/OrderedMap.ts

@@ -22,13 +22,16 @@ class OrderedMapIterator<K, V> extends TreeIterator<K, V> {
     }
     const self = this;
     return new Proxy(<[K, V]><unknown>[], {
-      get(_, props: '0' | '1') {
-        if (props === '0') return self._node._key;
-        else if (props === '1') return self._node._value;
+      get(target, prop: '0' | '1') {
+        if (prop === '0') return self._node._key!;
+        else if (prop === '1') return self._node._value!;
+        target[0] = self._node._key!;
+        target[1] = self._node._value!;
+        return target[prop];
       },
-      set(_, props: '1', newValue: V) {
-        if (props !== '1') {
-          throw new TypeError('props must be 1');
+      set(_, prop: '1', newValue: V) {
+        if (prop !== '1') {
+          throw new TypeError('prop must be 1');
         }
         self._node._value = newValue;
         return true;

test/HashContainerTest/HashMap.test.ts

@@ -114,6 +114,19 @@ function hashMapTest(generateRandom: () => unknown) {
     // @ts-ignore
     // eslint-disable-next-line no-return-assign
     expect(() => myHashMap.find(myHashMap.front()![0]).pointer[3] = 5).to.throw(TypeError);
+
+    expect(() => {
+      for (let it = myHashMap.begin(); !it.equals(myHashMap.end()); it.next()) {
+        const pointer = it.pointer;
+        const [key, value] = pointer;
+        expect(key).to.equal(pointer[0]);
+        expect(value).to.equal(pointer[1]);
+        pointer[1] = 2;
+        const [_key, _value] = pointer;
+        expect(_key).to.equal(pointer[0]);
+        expect(_value).to.equal(2);
+      }
+    }).to.not.throw(Error);
   });
 
   it('HashMap clear test', () => {

test/OtherTest/iterator.test.ts

@@ -161,4 +161,13 @@ describe('iterator test', () => {
       expect(() => container.eraseElementByIterator(container.rEnd())).to.throw(RangeError);
     }
   });
+
+  it('isAccessible test', () => {
+    for (const container of containerArr) {
+      expect(container.begin().isAccessible()).to.equal(true);
+      expect(container.begin().next().isAccessible()).to.equal(true);
+      expect(container.end().isAccessible()).to.equal(false);
+      expect(container.end().pre().isAccessible()).to.equal(true);
+    }
+  });
 });

test/TreeContainerTest/OrderedMap.test.ts

@@ -212,6 +212,21 @@ describe('OrderedMap test', () => {
     expect(mp.end().index).to.equal(mp.size() - 1);
   });
 
+  it('OrderedMap iterator iterator test', () => {
+    expect(() => {
+      for (let it = myOrderedMap.begin(); !it.equals(myOrderedMap.end()); it.next()) {
+        const pointer = it.pointer;
+        const [key, value] = pointer;
+        expect(key).to.equal(pointer[0]);
+        expect(value).to.equal(pointer[1]);
+        pointer[1] = 2;
+        const [_key, _value] = pointer;
+        expect(_key).to.equal(pointer[0]);
+        expect(_value).to.equal(2);
+      }
+    }).to.not.throw(Error);
+  });
+
   it('OrderedMap clear function test', () => {
     myOrderedMap.clear();
     stdMap.clear();