update: v2.0.1

Author: SIY1121

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twinte-parser",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Twinte内部で使用するために開発されたKdBパーサ",
   "private": false,
   "main": "dist/index.js",
@@ -31,18 +31,16 @@
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-prettier": "^3.1.0",
     "prettier": "^2.2.1",
-    "typescript": "^4.1.3"
+    "typescript": "^4.1.3",
+    "ts-node": "^9.1.1"
   },
   "dependencies": {
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
-    "cli-progress": "^2.1.1",
-    "colors": "^1.3.3",
     "command-line-args": "^5.1.1",
     "csv": "^5.1.1",
     "iconv-lite": "^0.5.0",
     "tough-cookie": "^4.0.0",
-    "ts-node": "^9.1.1",
     "xlsx": "^0.16.9"
   }
 }

src/app.ts

@@ -1,10 +1,9 @@
 import * as fs from 'fs'
 import downloadKdb from './kdbDownloader'
 import parse from './parser'
-import * as colors from 'colors'
 import * as commandLineArgs from 'command-line-args'
 
-console.log('twinte-parser v2.0.0')
+console.log('twinte-parser v2.0.1')
 
 const ops = commandLineArgs([
   { name: 'year', alias: 'y', defaultValue: undefined },

src/index.ts

@@ -1,5 +1,5 @@
 import parseKDB from './parser'
-import downloadKDB from './kdbDownloader'
+import downloadKDB, { NoCoursesFoundError } from './kdbDownloader'
 export default parseKDB
-export { downloadKDB, parseKDB }
+export { downloadKDB, parseKDB, NoCoursesFoundError }
 export * from './types'

src/kdbDownloader.ts

@@ -1,8 +1,6 @@
 import _axios from 'axios'
 import _axiosCookiejarSupport from 'axios-cookiejar-support'
 import * as iconv from 'iconv-lite'
-import * as fs from 'fs'
-import * as colors from 'colors'
 import * as assert from 'assert'
 
 export class NoCoursesFoundError extends Error {
@@ -32,8 +30,11 @@ const postBody = (obj: any) => {
   return urlParams
 }
 
-const extractFlowExecutionKey = (html: string) =>
-  html.match(/&_flowExecutionKey=(.*?)"/m)[1]
+const extractFlowExecutionKey = (html: string) => {
+  const key = html.match(/&_flowExecutionKey=(.*?)"/m)[1]
+  assert(key)
+  return key
+}
 
 const grantSession = async (): Promise<string> => {
   const res = await axios.get<Buffer>('https://kdb.tsukuba.ac.jp/')
@@ -109,7 +110,7 @@ const downloadExcel = async (
 }
 
 /**
- * KDBからCSVを取得
+ * KDBからExcelファイルを取得
  */
 export default async (
   year: number = new Date().getFullYear()

src/parser.ts

@@ -2,6 +2,7 @@ import { Course, Day, Module } from './types'
 import * as parseCsv from 'csv-parse/lib/sync'
 import * as _cliProgress from 'cli-progress'
 import { read as readXLSX, utils } from 'xlsx'
+import * as assert from 'assert'
 
 /**
  * '月1,2' 等の曜日と時限の文字列を解析し、分解する
@@ -137,6 +138,7 @@ const analyzeRow = (columns: string[]) => {
     Math.max(periodArray.length, roomArray.length)
   )
 
+  // データが壊れている可能性がある場合
   if (
     !(
       (moduleArray.length === count || moduleArray.length === 1) &&
@@ -174,7 +176,7 @@ const analyzeRow = (columns: string[]) => {
  */
 export default (data: Buffer): Course[] => {
   const sheet = readXLSX(data).Sheets['開設科目一覧']
-
+  assert(sheet)
   const courses: Course[] = []
 
   for (let r = 5; ; r++) {

yarn.lock

@@ -193,13 +193,6 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-progress@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-2.1.1.tgz#45ee1b143487c19043a3262131ccb4676f87f032"
-  dependencies:
-    colors "^1.1.2"
-    string-width "^2.1.1"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -227,10 +220,6 @@ [email protected]:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@^1.1.2, colors@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
-
 command-line-args@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a"
@@ -688,7 +677,6 @@ lodash@^4.17.11, lodash@^4.17.12:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
-
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -915,7 +903,7 @@ stream-transform@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-1.0.8.tgz#54f721122d310eca855a16c97939881ab5bbb76c"
 
-string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies: