fix: incorrect fizz buzz

Author: UltiRequiem

readme.md

@@ -87,7 +87,8 @@ Eg 👉
 
 ## Documentation
 
-Is hosted on [Deno Doc](https://doc.deno.land/https://deno.land/x/eloq/mod.ts) 📄
+Is hosted on [Deno Doc](https://doc.deno.land/https://deno.land/x/eloq/mod.ts)
+📄
 
 ## Support
 

src/program_structure/buzzfizz.ts

@@ -0,0 +1,11 @@
+function fizzBuzzExpected(max: number) {
+  return Array.from({ length: max }, (_, i) => {
+    const n = i + 1;
+
+    if (n % 15 === 0) return "FizzBuzz";
+    if (n % 3 === 0) return "Fizz";
+    if (n % 5 === 0) return "Buzz";
+
+    return n;
+  });
+}

src/program_structure/fizzbuzz.test.ts

@@ -17,13 +17,21 @@ Deno.test("[fizzBuzz]", () => {
     FIZZ,
     13,
     14,
-    FIZZ,
     FIZZ_BUZZ,
   ];
 
   assertEquals(fizzBuzz(15), expected);
 });
 
+Deno.test("[fizzBuzz] spot check", () => {
+  const result = fizzBuzz(20);
+
+  assertEquals(result[2], FIZZ);
+  assertEquals(result[4], BUZZ);
+  assertEquals(result[14], FIZZ_BUZZ);
+  assertEquals(result[19], BUZZ);
+});
+
 Deno.test("[isDivisbleBy]", () => {
   assert(divisibleBy(15, 3));
   assert(divisibleBy(15, 5));

src/program_structure/fizzbuzz.ts

@@ -7,24 +7,24 @@ export const FIZZ = "Fizz";
 export const BUZZ = "Buzz";
 export const FIZZ_BUZZ = "FizzBuzz";
 
+export type FizzBuzz = typeof FIZZ | typeof BUZZ | typeof FIZZ_BUZZ | number;
+
 export function fizzBuzz(max = 100) {
-  const result: (typeof FIZZ | typeof BUZZ | typeof FIZZ_BUZZ | number)[] = [];
+  const result: FizzBuzz[] = [];
 
   for (let number = 1; number <= max; number++) {
     const fizz = divisibleBy(number, 3);
     const buzz = divisibleBy(number, 5);
 
-    if (fizz) {
+    if (fizz && buzz) {
+      result.push(FIZZ_BUZZ);
+    } else if (fizz) {
       result.push(FIZZ);
     } else if (buzz) {
       result.push(BUZZ);
     } else {
       result.push(number);
     }
-
-    if (fizz && buzz) {
-      result.push(FIZZ_BUZZ);
-    }
   }
 
   return result;