Refactoring

Author: Mqxx

src/array/for_each_pair.test.ts

@@ -1,4 +1,3 @@
-import { assertEquals } from "https://deno.land/std@0.203.0/assert/assert_equals.ts";
 import {
   assertSpyCall,
   assertSpyCalls,
@@ -7,49 +6,61 @@ import {
 import forEachPair from "./for_each_pair.ts";
 
 Deno.test(
-    'Remove duplicates from array.',
-    async (test) => {
-        await test.step({
-            name: 'Empty array',
-            fn: () => {
-                function dummyFunction(
-                    previousValue : number,
-                    currentValue : number
-                ) : {
-                    previousValue : number,
-                    currentValue : number
-                } { return {
-                    previousValue, currentValue
-                }}
-                
-                const dummyFunctionSpy = spy(dummyFunction);
+  'Remove duplicates from array.',
+  async (test) => {
+    await test.step({
+      name: 'Empty array',
+      fn: () => {
+        function dummyFunction(
+          previousValue : number,
+          currentValue : number
+        ) : {
+          previousValue : number,
+          currentValue : number
+        } { return {
+          previousValue, currentValue
+        }}
+        
+        const dummyFunctionSpy = spy(dummyFunction);
 
-                forEachPair(
-                    [0, 2, 3, 7],
-                    dummyFunctionSpy
-                )
+        forEachPair(
+          [0, 2, 3, 7],
+          dummyFunctionSpy
+        )
 
-                assertSpyCall(dummyFunctionSpy, 0, {
-                    args: [
-                        0,
-                        2
-                    ]
-                })
-                assertSpyCall(dummyFunctionSpy, 1, {
-                    args: [
-                        2,
-                        3
-                    ]
-                })
-                assertSpyCall(dummyFunctionSpy, 2, {
-                    args: [
-                        3,
-                        7
-                    ]
-                })
-
-                assertSpyCalls(dummyFunctionSpy, 3);
-            }
+        assertSpyCall(dummyFunctionSpy, 0, {
+          args: [
+            0,
+            2
+          ],
+          returned: {
+            currentValue: 0,
+            previousValue: 2
+          }
+        })
+        assertSpyCall(dummyFunctionSpy, 1, {
+          args: [
+            2,
+            3
+          ],
+          returned: {
+            currentValue: 2,
+            previousValue: 3
+          }
         })
-    }
+        assertSpyCall(dummyFunctionSpy, 2, {
+          args: [
+            3,
+            7
+          ],
+          returned: {
+            currentValue: 3,
+            previousValue: 7
+          }
+        })
+
+        assertSpyCalls(dummyFunctionSpy, 3);
+      }
+    })
+  }
 )

src/format/mod.ts

@@ -1,21 +1,8 @@
 import formatString from "./format_string.ts";
 import truncate from "./truncate.ts";
-import trimCharactersStart from "./trim_characters_start.ts";
-import trimCharactersEnd from "./trim_characters_end.ts";
-import trimCharacters from "./trim_characters.ts";
-import trimSequenceStart from './trim_sequence_start.ts';
-import trimSequenceEnd from './trim_sequence_end.ts';
-import trimSequence from './trim_sequence.ts';
-import reverseString from './reverse_string.ts';
+
 
 export { 
     formatString,
     truncate,
-    trimCharactersStart,
-    trimCharactersEnd,
-    trimCharacters,
-    trimSequenceStart,
-    trimSequenceEnd,
-    trimSequence,
-    reverseString
 }

src/string/mod.ts

@@ -1,3 +1,7 @@
+import reverseString from './reverse_string.ts';
+import {trim} from './trim/mod.ts'
+
 export {
-  
+  reverseString,
+  trim
 }

src/format/reverse_string.test.ts renamed to src/string/reverse_string.test.ts

@@ -0,0 +1,15 @@
+import trimCharacters from './trim_characters.ts';
+import trimCharactersEnd from './trim_characters_end.ts';
+import trimCharactersStart from './trim_characters_start.ts';
+import trimSequence from './trim_sequence.ts';
+import trimSequenceEnd from './trim_sequence_end.ts';
+import trimSequenceStart from './trim_sequence_start.ts';
+
+export const trim = {
+  trimCharactersStart,
+  trimCharactersEnd,
+  trimCharacters,
+  trimSequenceStart,
+  trimSequenceEnd,
+  trimSequence
+}