Merge branch 'code-differently:main' into lesson_06

Author: jxwatson251

.github/workflows/check_lesson_06_pr.yaml

@@ -0,0 +1,32 @@
+name: Check Lesson 06 Pull Request
+
+on:
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - "lesson_06/expression/**"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20.x'
+
+    - name: Build Shared Lib with Node.js
+      working-directory: ./lib/javascript/codedifferently-instructional
+      run: npm ci
+
+    - name: Build Lesson 06 with Node.js
+      working-directory: ./lesson_06/expression
+      run: |
+        npm ci
+        npm run check

.github/workflows/check_push.yml

@@ -8,6 +8,8 @@ on:
       - "lib/**"
       - "lesson_02/quiz/**"
       - "lesson_03/quiz/**"
+      - "lesson_06/quiz/**"
+      - "lesson_06/expression/**"
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -71,3 +73,16 @@ jobs:
         npm ci
         npm run compile
         npm run lint
+
+    - name: Build Lesson 06 Quiz with Node.js
+      working-directory: ./lesson_06/quiz
+      run: |
+        npm ci
+        npm run compile
+        npm run lint
+
+    - name: Build Lesson 06 Expression with Node.js
+      working-directory: ./lesson_06/expression
+      run: |
+        npm ci
+        npm run compile

lesson_06/expression/src/functions.ts

@@ -1,16 +1,17 @@
-export const FUNCTIONS: Record<string, Function> = Object.freeze({
-  A: (a: number, b: number, c: number, d: number, e: number) =>
-    ((a + b) * c) / Math.pow(d, e),
-  B: (a: number, b: number, c: number, d: number, e: number) =>
-    Math.pow(a + b, c) / (d * e),
-  C: (a: number, b: number, c: number, d: number, e: number) =>
-    a / b + c * Math.pow(d, e),
-  D: (a: number, b: number, c: number, d: number, e: number) =>
-    (a * b) / Math.pow(c + d, e),
-  E: (a: number, b: number, c: number, d: number, e: number) =>
-    Math.pow((a + b) / c, d) * e,
-  F: (a: number, b: number, c: number, d: number, e: number) =>
-    (a * Math.pow(b + c, d)) / e,
-  G: (a: number, b: number, c: number, d: number, e: number) =>
-    ((Math.pow(a, b) + c) * d) / e,
-});
+export const FUNCTIONS: Record<string, (...args: number[]) => number> =
+  Object.freeze({
+    A: (a: number, b: number, c: number, d: number, e: number) =>
+      ((a + b) * c) / Math.pow(d, e),
+    B: (a: number, b: number, c: number, d: number, e: number) =>
+      Math.pow(a + b, c) / (d * e),
+    C: (a: number, b: number, c: number, d: number, e: number) =>
+      a / b + c * Math.pow(d, e),
+    D: (a: number, b: number, c: number, d: number, e: number) =>
+      (a * b) / Math.pow(c + d, e),
+    E: (a: number, b: number, c: number, d: number, e: number) =>
+      Math.pow((a + b) / c, d) * e,
+    F: (a: number, b: number, c: number, d: number, e: number) =>
+      (a * Math.pow(b + c, d)) / e,
+    G: (a: number, b: number, c: number, d: number, e: number) =>
+      ((Math.pow(a, b) + c) * d) / e,
+  });

lesson_06/expression/src/lesson6.test.ts

@@ -17,7 +17,7 @@ describe("Lesson6Test", () => {
     const c = 3;
     const d = 4;
     const e = 5;
-    const expected = FUNCTIONS[process.env.HW_VERSION!].call(
+    const expected = FUNCTIONS[process.env.HW_VERSION || ""].call(
       null,
       ...[a, b, c, d, e],
     );

lesson_06/expression/src/lesson6.ts

@@ -13,7 +13,7 @@ const rl = createInterface({
 });
 
 const main = async () => {
-  const testFunction = FUNCTIONS[process.env.HW_VERSION!];
+  const testFunction = FUNCTIONS[process.env.HW_VERSION || ""];
   if (testFunction === undefined) {
     console.log("HW_VERSION version not set in config. Exiting...");
     process.exit(1);

lesson_06/expression/src/utils.ts

@@ -12,9 +12,9 @@ export const askQuestion = (
   });
 };
 
-export const getFunctionBody = (f: Function) => {
-  const fString = f.toString().split("=>").pop()!;
-  return beautify(fString);
+export const getFunctionBody = (f: () => unknown) => {
+  const fString = f.toString().split("=>").pop();
+  return beautify(fString || "");
 };
 
 export const printFormualaWithValues = (
@@ -34,7 +34,7 @@ export const printFormualaWithValues = (
     ["e", String(e)],
     ["pow", "Math.pow"],
   ).reduce(
-    (acc: string, param: string[]) => acc.replace(param[0]!, param[1]!),
+    (acc: string, param: string[]) => acc.replace(param[0], param[1]),
     functionBody,
   );
   console.log(`\nNow computing the value of ${formula}`);