fix workflows

arjunpat · Nov 19, 2023 · 88bbce8 · 88bbce8
1 parent e0309b0
commit 88bbce8
Show file tree

Hide file tree

Showing 6 changed files with 173 additions and 127 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,20 +19,11 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '18.x' # You can specify the desired Node.js version here
+          node-version: "18.x" # You can specify the desired Node.js version here
 
       - name: Install dependencies
         run: npm install
 
       - name: Run index.js
         id: run-node
-        run: node index.js || echo "Error"
-
-      - name: Check for output
-        run: |
-          if [ -z "${{ steps.run-node.outputs.stdout }}" ]; then
-            echo "No output. Success!"
-          else
-            echo "Error: ${{ steps.run-node.outputs.stdout }}"
-            exit 1
-          fi
+        run: npm test
diff --git a/Validator.js b/Validator.js
@@ -1,14 +1,20 @@
 const validEventRegEx = /^[a-zA-Z0-9\s:&/]+$/;
 const calendarItemRegEx = /^[a-zA-Z0-9\s/"\-'.]+$/;
 
-const defaultNonPeriods = new Set(['Free', 'Brunch', 'Break', 'Lunch', 'Passing'])
+const defaultNonPeriods = new Set([
+  "Free",
+  "Brunch",
+  "Break",
+  "Lunch",
+  "Passing",
+]);
 
 class Validator {
   constructor(school, schedule) {
     this.errors = {
       school: [],
-      schedule: []
-    }
+      schedule: [],
+    };
 
     this.school = this.parseSchool(school);
     this.schedule = this.parseSchedule(schedule);
@@ -19,24 +25,25 @@ class Validator {
 
   validate() {
     let mentions = new Set(this.schedule.defaults.pattern);
-    mentions.forEach(p => {
+    mentions.forEach((p) => {
       if (!this.school.presets[p])
         this.schoolError(`No preset "${p}" as mentioned in defaults`);
     });
 
-
-    mentions = new Set(this.schedule.calendar.map(e => e.content.t));
-    mentions.forEach(p => {
+    mentions = new Set(this.schedule.calendar.map((e) => e.content.t));
+    mentions.forEach((p) => {
       if (!this.school.presets[p])
         this.schoolError(`No preset "${p}" as mentioned in calendar`);
     });
   }
 
   cleanup() {
-    let mentions = new Set([...this.schedule.calendar.map(i => i.content.t), ...this.schedule.defaults.pattern]);
+    let mentions = new Set([
+      ...this.schedule.calendar.map((i) => i.content.t),
+      ...this.schedule.defaults.pattern,
+    ]);
     for (let preset in this.school.presets)
-      if (!mentions.has(preset))
-        delete this.school.presets[preset];
+      if (!mentions.has(preset)) delete this.school.presets[preset];
   }
 
   schoolError(text) {
@@ -58,76 +65,91 @@ class Validator {
   getCleaned() {
     return {
       school: this.school,
-      schedule: this.schedule
-    }
+      schedule: this.schedule,
+    };
   }
 
   parseSchool(school) {
     let obj = {
       periods: school.periods,
-      presets: {}
-    }
+      presets: {},
+    };
     delete school.periods;
 
     if (!(obj.periods instanceof Array)) {
-      this.schoolError(`Unable to understand "periods"; they must be in the form of an array`);
+      this.schoolError(
+        `Unable to understand "periods"; they must be in the form of an array`,
+      );
       return;
     }
 
-    if (school['non-periods']) {
-      obj.nonPeriods = school['non-periods']
-      delete school['non-periods']
+    if (school["non-periods"]) {
+      obj.nonPeriods = school["non-periods"];
+      delete school["non-periods"];
 
       for (let each of obj.nonPeriods) {
         if (obj.periods.includes(each))
           this.schoolError(`"${each}" cannot be both a period and non-period`);
         if (defaultNonPeriods.has(each))
-          this.schoolError(`"${each}" is, by default, a non-period. You can remove it from the "non-periods" section`);
+          this.schoolError(
+            `"${each}" is, by default, a non-period. You can remove it from the "non-periods" section`,
+          );
       }
     }
 
     let validEvents = new Set([...obj.periods, ...(obj.nonPeriods || [])]);
     for (let each in validEvents) {
-      if (each === 'Free')
+      if (each === "Free")
         this.schoolError('"Free" cannot be a period or non-period');
       if (validEventRegEx.test(each))
-        this.schoolError(`"${each}" is not a valid event name. It includes invalid characters`);
+        this.schoolError(
+          `"${each}" is not a valid event name. It includes invalid characters`,
+        );
     }
 
     const nameRegEx = /^[a-zA-Z-/0-9\(\) ]+$/;
     for (let key in school) {
       obj.presets[key] = {
         n: (() => {
-          if (typeof school[key].name !== 'string' || !nameRegEx.test(school[key].name)) {
-            this.schoolError(`Preset "${key}" does not have a valid name: a valid name must be a string`);
+          if (
+            typeof school[key].name !== "string" ||
+            !nameRegEx.test(school[key].name)
+          ) {
+            this.schoolError(
+              `Preset "${key}" does not have a valid name: a valid name must be a string`,
+            );
           }
           return school[key].name;
         })(),
         s: (() => {
-          if (typeof school[key].schedule === 'undefined') {
-            this.schoolError(`Preset "${key}" does not have a schedule; please add a schedule field.`)
+          if (typeof school[key].schedule === "undefined") {
+            this.schoolError(
+              `Preset "${key}" does not have a schedule; please add a schedule field.`,
+            );
           } else if (!school[key].schedule) {
             return [];
           } else if (school[key].schedule instanceof Array) {
             this.checkScheduleArray(school[key].schedule, key, validEvents);
 
             return this.parseScheduleArray(school[key].schedule);
           } else {
-            this.schoolError(`Preset "${key}" does not have a valid schedule: a valid schedule must be either an array or null (~)`);
+            this.schoolError(
+              `Preset "${key}" does not have a valid schedule: a valid schedule must be either an array or null (~)`,
+            );
           }
-        })()
-      }
+        })(),
+      };
     }
 
     return obj;
   }
 
   getEvent(str) {
-    let i = str.indexOf(' ');
+    let i = str.indexOf(" ");
     return {
       f: str.substr(0, i),
-      n: str.substr(i + 1, str.length)
-    }
+      n: str.substr(i + 1, str.length),
+    };
   }
 
   parseScheduleArray(arr) {
@@ -136,27 +158,38 @@ class Validator {
 
   checkScheduleArray(scheduleArr, presetName, validEvents) {
     let last;
-    for (let i = 0; i < scheduleArr.length;) {
-      let str = scheduleArr[i]
-      if (typeof str !== 'string') {
-        this.schoolError(`Preset "${presetName}" has an invalid schedule near (${str}). Not a string.`);
-        i++; continue;
+    for (let i = 0; i < scheduleArr.length; ) {
+      let str = scheduleArr[i];
+      if (typeof str !== "string") {
+        this.schoolError(
+          `Preset "${presetName}" has an invalid schedule near (${str}). Not a string.`,
+        );
+        i++;
+        continue;
       }
 
       let event = this.getEvent(str);
       if (!validEvents.has(event.n) && !defaultNonPeriods.has(event.n))
-        this.schoolError(`Preset "${presetName}" has an invalid schedule near (${str}). "${event.n}" is not mentioned in "periods" or "non-periods".`);
+        this.schoolError(
+          `Preset "${presetName}" has an invalid schedule near (${str}). "${event.n}" is not mentioned in "periods" or "non-periods".`,
+        );
 
       let time = Date.parse(`1/1/1970 ${event.f}`);
       if (isNaN(time))
-        this.schoolError(`Preset "${presetName}" has an invalid schedule near (${str}). It was unable to parse the time of this event.`);
-
-      if (typeof last === 'number' && last >= time)
-        this.schoolError(`Preset "${presetName}" has an invalid schedule near (${str}). This error is due to the time/format of this line or surrounding lines. Please check that you are using 24 hour time.`);
+        this.schoolError(
+          `Preset "${presetName}" has an invalid schedule near (${str}). It was unable to parse the time of this event.`,
+        );
+
+      if (typeof last === "number" && last >= time)
+        this.schoolError(
+          `Preset "${presetName}" has an invalid schedule near (${str}). This error is due to the time/format of this line or surrounding lines. Please check that you are using 24 hour time.`,
+        );
       last = time;
 
-      if (++i === scheduleArr.length && event.n !== 'Free')
-        this.schoolError(`Preset "${presetName}" has an invalid schedule: it does not end with a "Free" period`);
+      if (++i === scheduleArr.length && event.n !== "Free")
+        this.schoolError(
+          `Preset "${presetName}" has an invalid schedule: it does not end with a "Free" period`,
+        );
     }
   }
 
@@ -167,7 +200,7 @@ class Validator {
   }
 
   parseCalendarArray(arr) {
-    return arr.map(e => this.parseCalendarString(e));
+    return arr.map((e) => this.parseCalendarString(e));
   }
 
   parseCalendarString(str) {
@@ -181,38 +214,43 @@ class Validator {
     if (pieces.length === 3) {
       str = pieces[0].trim();
       n = pieces[1];
-    } else if (pieces.length > 1) // there shouldn't be one "
+    } else if (pieces.length > 1)
+      // there shouldn't be one "
       bad = true;
 
-    pieces = str.split(' ');
+    pieces = str.split(" ");
     bad = bad || pieces.length !== 2;
-    
+
     let t = pieces[1];
     let from, to, date;
 
-    if (pieces[0].includes('-')) {
-      pieces = pieces[0].split('-');
+    if (pieces[0].includes("-")) {
+      pieces = pieces[0].split("-");
       from = pieces[0];
       to = pieces[1];
 
-      bad = bad || pieces.length !== 2 || isNaN(Date.parse(from)) || isNaN(Date.parse(to)) || Date.parse(to) <= Date.parse(from);
+      bad =
+        bad ||
+        pieces.length !== 2 ||
+        isNaN(Date.parse(from)) ||
+        isNaN(Date.parse(to)) ||
+        Date.parse(to) <= Date.parse(from);
     } else {
       date = pieces[0];
       bad = bad || isNaN(Date.parse(date));
     }
 
-    if (bad)
-      this.scheduleError(`Issue parsing calendar around (${original})`);
+    if (bad) this.scheduleError(`Issue parsing calendar around (${original})`);
 
     return {
       date,
       from,
       to,
       content: {
         n,
-        t
-      }
-    }
+        t,
+      },
+    };
   }
 }
 

diff --git a/data/mvhs/school.yml b/data/mvhs/school.yml
@@ -17,7 +17,7 @@ non-periods:
   - Period 3A
   - Period 3B
   - Period 4A
-  - Period 4B  
+  - Period 4B
   - Junior ELA Testing
   - Junior Math Testing
   - Junior Math and Senior Science Testing
@@ -86,7 +86,7 @@ schedule-d:
     - 10:52 Period 5
     - 11:52 Free
     - 11:59 Period 7
-    - 12:59 Free # <- Technically Lunch 
+    - 12:59 Free # <- Technically Lunch
 
 schedule-e:
   name: Schedule E (Early Release)