Bump scraper deps (#3125)

Author: taneliang

scrapers/nus-v2/package.json

@@ -17,52 +17,50 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "@types/bunyan": "1.8.5",
+    "@types/bunyan": "1.8.6",
     "@types/deep-diff": "1.0.0",
-    "@types/fs-extra": "5.0.5",
-    "@types/jest": "23.3.13",
-    "@types/joi": "14.3.1",
+    "@types/fs-extra": "9.0.6",
     "@types/lodash": "4.14.167",
-    "@types/mock-fs": "4.10.0",
-    "@types/oboe": "2.0.28",
+    "@types/mock-fs": "4.13.0",
+    "@types/node": "14.14.19",
+    "@types/oboe": "2.0.29",
     "@types/promise-queue": "2.2.0",
-    "@types/ramda": "0.25.50",
-    "@types/yargs": "12.0.9",
-    "@types/node": "12.12.6",
-    "@typescript-eslint/eslint-plugin": "3.10.1",
-    "@typescript-eslint/parser": "3.10.1",
-    "eslint": "7.16.0",
+    "@types/ramda": "0.27.34",
+    "@types/yargs": "15.0.12",
+    "@typescript-eslint/eslint-plugin": "4.11.1",
+    "@typescript-eslint/parser": "4.11.1",
+    "eslint": "7.17.0",
     "eslint-config-airbnb-base": "14.2.1",
-    "eslint-config-prettier": "6.15.0",
+    "eslint-config-prettier": "7.1.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-prettier": "3.3.0",
-    "http-status": "1.3.1",
+    "http-status": "1.5.0",
     "jest": "26.6.3",
-    "jest-junit": "11.0.1",
+    "jest-junit": "12.0.0",
     "mock-fs": "4.13.0",
-    "prettier": "2.0.5",
+    "prettier": "2.2.1",
     "swagger-ui-dist": "3.38.0",
-    "ts-jest": "26.1.3",
-    "ts-node": "8.10.2",
-    "typescript": "3.9.7"
+    "ts-jest": "26.4.4",
+    "ts-node": "9.1.1",
+    "typescript": "4.1.3"
   },
   "dependencies": {
     "@elastic/elasticsearch": "7.10.0",
-    "@sentry/node": "4.6.6",
-    "axios": "0.18.0",
-    "bunyan": "1.8.12",
-    "chevrotain": "4.8.1",
-    "date-fns": "2.0.0-alpha.27",
+    "@sentry/node": "5.29.2",
+    "axios": "0.21.1",
+    "bunyan": "1.8.14",
+    "chevrotain": "7.1.0",
+    "date-fns": "2.16.1",
     "deep-diff": "1.0.2",
-    "fs-extra": "7.0.1",
-    "joi": "14.3.1",
-    "lodash": "4.17.11",
+    "fs-extra": "9.0.1",
+    "joi": "17.3.0",
+    "lodash": "4.17.20",
     "nusmoderator": "3.0.0",
     "oboe": "2.1.5",
     "promise-queue": "2.2.5",
     "ramda": "0.27.1",
     "romanify": "1.0.0",
-    "yargs": "13.3.2"
+    "yargs": "16.2.0"
   },
   "engines": {
     "node": ">=10"

scrapers/nus-v2/src/services/logger/SentryStream.ts

@@ -4,8 +4,8 @@
  */
 
 import * as Sentry from '@sentry/node';
-import { each, pick } from 'lodash';
-import { Stream } from 'bunyan';
+import type { Stream } from 'bunyan';
+import { mapValues, pick } from 'lodash';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -42,7 +42,7 @@ function getSentryLevel(record: BunyanRecord): Sentry.Severity {
  * Error deserializing function. Bunyan serializes the error to object
  * https://github.com/trentm/node-bunyan/blob/master/lib/bunyan.js#L1089
  * @param  {object} data serialized Bunyan
- * @return {Error}       the deserialiazed error
+ * @return {Error}       the deserialized error
  */
 function deserializeError(data: any) {
   if (data instanceof Error) return data;
@@ -66,34 +66,22 @@ type StreamConfig = {
 };
 
 export default function getSentryStream(config: StreamConfig = {}): Stream {
-  const tagProps = config.tags || [];
-  const extraProps = config.extra || [];
+  const tagProps = config.tags ?? [];
+  const extraProps = config.extra ?? [];
 
   const stream: any = {
     write(record: BunyanRecord) {
-      const tags = pick(record, tagProps);
-      const extra = pick(record, extraProps);
-      const level = getSentryLevel(record);
-
       Sentry.withScope((scope) => {
-        scope.setLevel(level);
-
-        each(tags, (value, prop) => {
-          scope.setTag(prop, String(value));
-        });
-
-        each(extra, (value, prop) => {
-          scope.setExtra(prop, value || null);
-        });
-
+        scope.setLevel(getSentryLevel(record));
+        scope.setTags(mapValues(pick(record, tagProps), (v) => String(v)));
+        scope.setExtras(mapValues(pick(record, extraProps), (v) => v ?? null));
         if (record.err) {
           scope.setExtra('msg', record.msg);
           Sentry.captureException(deserializeError(record.err));
         } else {
           Sentry.captureMessage(record.msg);
         }
       });
-
       return true;
     },
   };

scrapers/nus-v2/src/services/logger/serializer.test.ts

@@ -1,3 +1,4 @@
+import type { AxiosRequestConfig } from 'axios';
 import { errorSerializer } from './serializer';
 import { UnknownApiError } from '../../utils/errors';
 import { mockResponse } from '../../utils/test-utils';
@@ -12,7 +13,7 @@ describe(errorSerializer, () => {
       msg: 'The server is on fire',
       data: ['Oh noes!'],
     };
-    const config = {
+    const config: AxiosRequestConfig = {
       url: 'https://example.com/api/test',
       method: 'post',
       data: '{"hello": "world"}',

scrapers/nus-v2/src/services/requisite-tree/parseString.ts

@@ -1,5 +1,5 @@
 import * as R from 'ramda';
-import { createToken, Lexer, Parser, IToken, TokenType } from 'chevrotain';
+import { EmbeddedActionsParser, IToken, Lexer, TokenType, createToken } from 'chevrotain';
 
 import { PrereqTree } from '../../types/modules';
 import { Logger } from '../logger';
@@ -70,15 +70,15 @@ function generateOrBranch(modules: PrereqTree[]) {
  * The code is extremely similar to the following example:
  * @see https://github.com/SAP/chevrotain/blob/master/examples/grammars/calculator/calculator_embedded_actions.js
  */
-class ReqTreeParser extends Parser {
+class ReqTreeParser extends EmbeddedActionsParser {
   parse: () => PrereqTree;
   orExpression: () => PrereqTree;
   andExpression: () => PrereqTree;
   parenthesisExpression: () => PrereqTree;
-  atomicExpression: () => string;
+  atomicExpression: () => PrereqTree;
 
   constructor() {
-    super(allTokens, { recoveryEnabled: true, outputCst: false });
+    super(allTokens, { recoveryEnabled: true });
 
     this.parse = this.RULE('parse', () => this.SUBRULE(this.andExpression));
 

scrapers/nus-v2/src/services/validation.ts

@@ -19,12 +19,16 @@ const lessonSchema = Joi.object({
   end_time: Joi.string().not(Joi.ref('start_time')),
   eventdate: Joi.string().isoDate(),
 
-  activity: Joi.string().only(Object.keys(activityLessonType)),
+  activity: Joi.string()
+    .allow(...Object.keys(activityLessonType))
+    .only(),
 
   modgrp: Joi.string(),
 
   // Assume lessons on Sunday are invalid
-  day: Joi.string().only(Object.keys(dayTextMap)),
+  day: Joi.string()
+    .allow(...Object.keys(dayTextMap))
+    .only(),
 
   numweeks: Joi.number().integer().greater(0),
 
@@ -33,7 +37,7 @@ const lessonSchema = Joi.object({
 });
 
 export function validateLesson(lesson: TimetableLesson, logger: Logger = rootLogger) {
-  const result = Joi.validate(lesson, lessonSchema, {
+  const result = lessonSchema.validate(lesson, {
     presence: 'required',
     allowUnknown: true,
     // Don't abort early so we can log all errors
@@ -52,7 +56,7 @@ const examSchema = Joi.object({
 });
 
 export function validateExam(exam: ModuleExam, logger: Logger = rootLogger) {
-  const result = Joi.validate(exam, examSchema, {
+  const result = examSchema.validate(exam, {
     presence: 'required',
     allowUnknown: true,
     // Don't abort early so we can log all errors
@@ -63,8 +67,11 @@ export function validateExam(exam: ModuleExam, logger: Logger = rootLogger) {
   return !result.error;
 }
 
-const semesterSchema = Joi.number().only(Semesters);
+const semesterSchema = Joi.number()
+  .allow(...Semesters)
+  .only();
+
 export function validateSemester(semester: string | Semester) {
-  const result = Joi.validate(+semester, semesterSchema, { presence: 'required' });
+  const result = semesterSchema.validate(+semester, { presence: 'required' });
   return !result.error;
 }

scrapers/nus-v2/src/types/v1.ts

@@ -7,24 +7,13 @@ type DayText = string; // E.g. "Monday", "Tuesday"
 type Department = string;
 type StartTime = string; // E.g. "1400"
 type EndTime = string; // E.g. "1500"
-type Faculty = string;
 type LessonType = string; // E.g. "Lecture", "Tutorial"
-type LessonTime = StartTime | EndTime;
 type ModuleCode = string; // E.g. "CS3216"
 type ModuleTitle = string;
 type Semester = number; // E.g. 1/2/3/4. 3 and 4 means special sem i and ii.
 type WeekText = string; // E.g. "Every Week", "Odd Week"
 type Venue = string;
 
-// Auxiliary data types
-type Day = 'Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday' | 'Sunday';
-
-type Time = 'Morning' | 'Afternoon' | 'Evening';
-
-type ModuleLevel = 1 | 2 | 3 | 4 | 5 | 6 | 8;
-
-type WorkloadComponent = 'Lecture' | 'Tutorial' | 'Laboratory' | 'Project' | 'Preparation';
-
 // RawLesson is a lesson time slot obtained from the API.
 // Usually ModuleCode and ModuleTitle has to be injected in before using in the timetable.
 export type V1RawLesson = {