test: increase test coverage, minor fixes

rimbu-org · Jan 26, 2024 · 3e392e5 · 3e392e5
1 parent 714e66e
commit 3e392e5
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 18 deletions.
diff --git a/deno_dist/graph/custom/valued/implementation/non-empty.ts b/deno_dist/graph/custom/valued/implementation/non-empty.ts
@@ -272,7 +272,7 @@ export class ValuedGraphNonEmpty<
     node2: N,
     options: {
       ifNew?: OptLazyOr<V, Token>;
-      ifExists?: (value: V, remove: Token) => V | Token;
+      ifExists?: ((value: V, remove: Token) => V | Token) | V;
     }
   ): TpG['nonEmpty'] {
     let newConnectionSize = this.connectionSize;
@@ -312,7 +312,10 @@ export class ValuedGraphNonEmpty<
             return newValue;
           },
           ifExists: (currentValue, remove) => {
-            const newValue = ifExists(currentValue, remove);
+            const newValue =
+              ifExists instanceof Function
+                ? ifExists(currentValue, remove)
+                : ifExists;
 
             if (Object.is(newValue, currentValue)) return currentValue;
 

diff --git a/deno_dist/list/custom/implementation/tree/operations.ts b/deno_dist/list/custom/implementation/tree/operations.ts
@@ -309,7 +309,7 @@ export function treeForEach<
 
   if (state.halted) return;
 
-  (reversed ? tree.right : tree.left).forEach(f, { state });
+  (reversed ? tree.right : tree.left).forEach(f, { reversed, state });
 
   if (state.halted) return;
 
@@ -319,5 +319,5 @@ export function treeForEach<
 
   if (state.halted) return;
 
-  (reversed ? tree.left : tree.right).forEach(f, { state });
+  (reversed ? tree.left : tree.right).forEach(f, { reversed, state });
 }
diff --git a/packages/graph/src/custom/valued/implementation/non-empty.mts b/packages/graph/src/custom/valued/implementation/non-empty.mts
@@ -272,7 +272,7 @@ export class ValuedGraphNonEmpty<
     node2: N,
     options: {
       ifNew?: OptLazyOr<V, Token>;
-      ifExists?: (value: V, remove: Token) => V | Token;
+      ifExists?: ((value: V, remove: Token) => V | Token) | V;
     }
   ): TpG['nonEmpty'] {
     let newConnectionSize = this.connectionSize;
@@ -312,7 +312,10 @@ export class ValuedGraphNonEmpty<
             return newValue;
           },
           ifExists: (currentValue, remove) => {
-            const newValue = ifExists(currentValue, remove);
+            const newValue =
+              ifExists instanceof Function
+                ? ifExists(currentValue, remove)
+                : ifExists;
 
             if (Object.is(newValue, currentValue)) return currentValue;
 

diff --git a/packages/graph/test/arrow-graph-test-standard.mts b/packages/graph/test/arrow-graph-test-standard.mts
@@ -200,6 +200,20 @@ export function runArrowGraphTestsWith(
       expect(graph3.disconnectAll(arr3).nodeSize).toBe(3);
     });
 
+    it('forEach', () => {
+      let counter = 0;
+      graphEmpty.forEach(() => counter++);
+      expect(counter).toEqual(0);
+
+      counter = 0;
+      graph3.forEach(() => counter++);
+      expect(counter).toEqual(3);
+
+      counter = 0;
+      graph6.forEach(() => counter++);
+      expect(counter).toEqual(8);
+    });
+
     it('getConnectionStreamFrom', () => {
       expect(graphEmpty.getConnectionStreamFrom('a')).toBe(Stream.empty());
       expect(graph3.getConnectionStreamFrom('z')).toBe(Stream.empty());

diff --git a/packages/graph/test/arrow-valued-graph-test-standard.mts b/packages/graph/test/arrow-valued-graph-test-standard.mts
@@ -193,6 +193,20 @@ export function runGraphTestsWith(
       expect(graph3.disconnectAll(arr3).nodeSize).toBe(3);
     });
 
+    it('forEach', () => {
+      let counter = 0;
+      graphEmpty.forEach(() => counter++);
+      expect(counter).toEqual(0);
+
+      counter = 0;
+      graph3.forEach(() => counter++);
+      expect(counter).toEqual(3);
+
+      counter = 0;
+      graph6.forEach(() => counter++);
+      expect(counter).toEqual(8);
+    });
+
     it('getConnectionStreamFrom', () => {
       expect(graphEmpty.getConnectionStreamFrom('a')).toBe(Stream.empty());
       expect(graph3.getConnectionStreamFrom('z')).toBe(Stream.empty());

diff --git a/packages/graph/test/edge-graph-test-standard.mts b/packages/graph/test/edge-graph-test-standard.mts
@@ -196,6 +196,20 @@ export function runEdgeGraphTestsWith(name: string, G: EdgeGraph.Context<any>) {
       expect(graph3.disconnectAll(arr3).nodeSize).toBe(3);
     });
 
+    it('forEach', () => {
+      let counter = 0;
+      graphEmpty.forEach(() => counter++);
+      expect(counter).toEqual(0);
+
+      counter = 0;
+      graph3.forEach(() => counter++);
+      expect(counter).toEqual(6);
+
+      counter = 0;
+      graph6.forEach(() => counter++);
+      expect(counter).toEqual(12);
+    });
+
     it('getConnectionStreamFrom', () => {
       expect(graphEmpty.getConnectionStreamFrom('a')).toBe(Stream.empty());
       expect(graph3.getConnectionStreamFrom('z')).toBe(Stream.empty());

diff --git a/packages/graph/test/edge-valued-graph-test-standard.mts b/packages/graph/test/edge-valued-graph-test-standard.mts
@@ -205,6 +205,20 @@ export function runGraphTestsWith(
       expect(graph3.disconnectAll(arr3).nodeSize).toBe(3);
     });
 
+    it('forEach', () => {
+      let counter = 0;
+      graphEmpty.forEach(() => counter++);
+      expect(counter).toEqual(0);
+
+      counter = 0;
+      graph3.forEach(() => counter++);
+      expect(counter).toEqual(6);
+
+      counter = 0;
+      graph6.forEach(() => counter++);
+      expect(counter).toEqual(12);
+    });
+
     it('getConnectionStreamFrom', () => {
       expect(graphEmpty.getConnectionStreamFrom('a')).toBe(Stream.empty());
       expect(graph3.getConnectionStreamFrom('z')).toBe(Stream.empty());

diff --git a/packages/list/src/custom/implementation/tree/operations.mts b/packages/list/src/custom/implementation/tree/operations.mts
@@ -309,7 +309,7 @@ export function treeForEach<
 
   if (state.halted) return;
 
-  (reversed ? tree.right : tree.left).forEach(f, { state });
+  (reversed ? tree.right : tree.left).forEach(f, { reversed, state });
 
   if (state.halted) return;
 
@@ -319,5 +319,5 @@ export function treeForEach<
 
   if (state.halted) return;
 
-  (reversed ? tree.left : tree.right).forEach(f, { state });
+  (reversed ? tree.left : tree.right).forEach(f, { reversed, state });
 }
diff --git a/packages/list/test/gen-builder.test.mts b/packages/list/test/gen-builder.test.mts
@@ -207,6 +207,9 @@ describe('GenBuilder', () => {
       const f = vi.fn();
       b.forEach(f);
       expect(f).not.toHaveBeenCalled();
+
+      b.forEach(f, { reversed: true });
+      expect(f).not.toHaveBeenCalled();
     }
     {
       // has sub builder

diff --git a/packages/list/test/leaf-block-builder.test.mts b/packages/list/test/leaf-block-builder.test.mts
@@ -160,15 +160,22 @@ describe('LeafBlockBuilder', () => {
 
   it('forEach', () => {
     {
-      const b = context.leafBlockBuilder([1, 2, 3]);
+      const b = context.leafBlockBuilder([1, 2, 3, 4]);
       const cb = vi.fn();
       b.forEach(cb);
-      expect(cb).toBeCalledTimes(3);
+      expect(cb).toBeCalledTimes(4);
       expect(cb.mock.calls[1][0]).toBe(2);
       expect(cb.mock.calls[1][1]).toBe(1);
 
       cb.mockReset();
 
+      b.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(4);
+      expect(cb.mock.calls[1][0]).toBe(3);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       b.forEach((_, __, halt) => {
         halt();
         cb();
@@ -177,15 +184,22 @@ describe('LeafBlockBuilder', () => {
       expect(cb).toBeCalledTimes(1);
     }
     {
-      const b = context.leafBlockBuilderSource(context.leafBlock([1, 2, 3]));
+      const b = context.leafBlockBuilderSource(context.leafBlock([1, 2, 3, 4]));
       const cb = vi.fn();
       b.forEach(cb);
-      expect(cb).toBeCalledTimes(3);
+      expect(cb).toBeCalledTimes(4);
       expect(cb.mock.calls[1][0]).toBe(2);
       expect(cb.mock.calls[1][1]).toBe(1);
 
       cb.mockReset();
 
+      b.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(4);
+      expect(cb.mock.calls[1][0]).toBe(3);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       b.forEach((_, __, halt) => {
         halt();
         cb();

diff --git a/packages/list/test/leaf-block.test.mts b/packages/list/test/leaf-block.test.mts
@@ -291,15 +291,22 @@ function runLeafBlockTests(
     });
 
     it('forEach', () => {
-      const b3 = createBlock(1, 2, 3);
+      const b3 = createBlock(1, 2, 3, 4);
       const cb = vi.fn();
       b3.forEach(cb);
-      expect(cb).toBeCalledTimes(3);
+      expect(cb).toBeCalledTimes(4);
       expect(cb.mock.calls[1][0]).toBe(2);
       expect(cb.mock.calls[1][1]).toBe(1);
 
       cb.mockReset();
 
+      b3.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(4);
+      expect(cb.mock.calls[1][0]).toBe(3);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       b3.forEach((_, __, halt) => {
         halt();
         cb();

diff --git a/packages/list/test/leaf-tree-builder.test.mts b/packages/list/test/leaf-tree-builder.test.mts
@@ -492,6 +492,13 @@ describe('LeafTreeBuilder', () => {
 
       cb.mockReset();
 
+      t.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(8);
+      expect(cb.mock.calls[1][0]).toBe(13);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       t.forEach((_, __, halt) => {
         halt();
         cb();

diff --git a/packages/list/test/leaf-tree.test.mts b/packages/list/test/leaf-tree.test.mts
@@ -303,8 +303,15 @@ function runLeafTreeTests(
       const cb = vi.fn();
       t6.forEach(cb);
       expect(cb).toBeCalledTimes(6);
-      expect(cb.mock.calls[1][0]).toBe(2);
-      expect(cb.mock.calls[1][1]).toBe(1);
+      expect(cb.mock.calls[2][0]).toBe(3);
+      expect(cb.mock.calls[2][1]).toBe(2);
+
+      cb.mockReset();
+
+      t6.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(6);
+      expect(cb.mock.calls[2][0]).toBe(1);
+      expect(cb.mock.calls[2][1]).toBe(2);
 
       cb.mockReset();
 

diff --git a/packages/list/test/list.test.mts b/packages/list/test/list.test.mts
@@ -881,6 +881,52 @@ describe('List methods', () => {
     expect(result).toEqual([1]);
   });
 
+  it('forEach reversed', () => {
+    let result = [] as number[];
+    listEmpty.forEach((v) => result.push(v), { reversed: true });
+    expect(result).toEqual([]);
+    result = [];
+    list3_1.forEach((v, i) => result.push(v + i), { reversed: true });
+    expect(result).toEqual([3, 3, 3]);
+
+    result = [];
+    list3_2.forEach((v, i) => result.push(v + i), { reversed: true });
+    expect(result).toEqual([3, 3, 3]);
+
+    result = [];
+    list6_1.forEach((v, i) => result.push(v + i), { reversed: true });
+    expect(result).toEqual([6, 6, 6, 6, 6, 6]);
+
+    result = [];
+    list6_2.forEach((v, i) => result.push(v + i), { reversed: true });
+    expect(result).toEqual([6, 6, 6, 6, 6, 6]);
+
+    const onlyFirst = (v: number, i: number, halt: () => void) => {
+      halt();
+      result.push(v + i);
+    };
+
+    result = [];
+    listEmpty.forEach(onlyFirst, { reversed: true });
+    expect(result).toEqual([]);
+
+    result = [];
+    list3_1.forEach(onlyFirst, { reversed: true });
+    expect(result).toEqual([3]);
+
+    result = [];
+    list3_2.forEach(onlyFirst, { reversed: true });
+    expect(result).toEqual([3]);
+
+    result = [];
+    list6_1.forEach(onlyFirst, { reversed: true });
+    expect(result).toEqual([6]);
+
+    result = [];
+    list6_2.forEach(onlyFirst, { reversed: true });
+    expect(result).toEqual([6]);
+  });
+
   it('map', () => {
     expect(listEmpty.map((v, i) => v + i)).toBe(listEmpty);
     expect(list3_1.map((v, i) => v + i).toArray()).toEqual([1, 3, 5]);

diff --git a/packages/list/test/nonleaf-block-builder.test.mts b/packages/list/test/nonleaf-block-builder.test.mts
@@ -214,6 +214,13 @@ describe('NonLeafBlockBuilder', () => {
 
       cb.mockReset();
 
+      b.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(8);
+      expect(cb.mock.calls[1][0]).toBe(13);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       b.forEach((_, __, halt) => {
         halt();
         cb();
@@ -239,6 +246,13 @@ describe('NonLeafBlockBuilder', () => {
 
       cb.mockReset();
 
+      b.forEach(cb, { reversed: true });
+      expect(cb).toBeCalledTimes(7);
+      expect(cb.mock.calls[1][0]).toBe(13);
+      expect(cb.mock.calls[1][1]).toBe(1);
+
+      cb.mockReset();
+
       b.forEach((_, __, halt) => {
         halt();
         cb();

diff --git a/packages/list/test/nonleaf-block.test.mts b/packages/list/test/nonleaf-block.test.mts
@@ -428,8 +428,15 @@ describe('NonLeafBlock', () => {
     const cb = vi.fn();
     nl.forEach(cb, { reversed: false, state: TraverseState() });
     expect(cb).toBeCalledTimes(9);
-    expect(cb.mock.calls[1][0]).toBe(2);
-    expect(cb.mock.calls[1][1]).toBe(1);
+    expect(cb.mock.calls[2][0]).toBe(3);
+    expect(cb.mock.calls[2][1]).toBe(2);
+
+    cb.mockReset();
+
+    nl.forEach(cb, { reversed: true, state: TraverseState() });
+    expect(cb).toBeCalledTimes(9);
+    expect(cb.mock.calls[2][0]).toBe(1);
+    expect(cb.mock.calls[2][1]).toBe(2);
 
     cb.mockReset();
 

diff --git a/packages/list/test/nonleaf-tree.test.mts b/packages/list/test/nonleaf-tree.test.mts
@@ -473,6 +473,13 @@ describe('NonLeafTree', () => {
 
     cb.mockReset();
 
+    t.forEach(cb, { reversed: true, state: TraverseState() });
+    expect(cb).toBeCalledTimes(36);
+    expect(cb.mock.calls[1][0]).toBe(8);
+    expect(cb.mock.calls[1][1]).toBe(1);
+
+    cb.mockReset();
+
     t.forEach(
       (_, __, halt) => {
         halt();