@ranzenjs/client 0.1.0 → 0.2.1

package/dist/apps/lessons/parse.js

@@ -70,9 +70,22 @@ export function parseCourse(document, id, drift = ignoreDrift) {
         marks: parseMarks(document, drift),
         exams: parseExams(document, drift),
         attendance: hours(rows(one('#attendanceTable', document)), drift),
-        hasFirstSemester: all('a[href*="halb=1"]', document).some((link) => queryParam(attr(link, 'href'), 'id') === id)
+        firstSemester: firstSemester(document, id)
     };
 }
+// Prefer a link to the course's own id, else the first-semester button, which is hidden in print.
+function firstSemester(document, id) {
+    const links = all('a[href]', document).filter((link) => {
+        const href = attr(link, 'href') ?? '';
+        return (/(^|\/)meinunterricht\.php\?/.test(href) &&
+            queryParam(href, 'a') === 'sus_view' &&
+            queryParam(href, 'halb') === '1');
+    });
+    if (links.some((link) => queryParam(attr(link, 'href'), 'id') === id))
+        return id;
+    const button = links.find((link) => ['btn', 'btn-default', 'hidden-print'].every((name) => hasClass(link, name)));
+    return queryParam(attr(button, 'href'), 'id');
+}
 // Entries carry their id in data-entry; rows without one are reported, never guessed.
 function entryRows(table, what, drift) {
     return table.filter((row) => {
@@ -165,7 +178,7 @@ function submission(group, drift) {
         }
     ];
 }
-// Each mark is a row of name, date and value, optionally followed by a one-cell comment row.
+// Each mark is a row of name, date and value, optionally followed by a comment in its own row.
 function parseMarks(document, drift) {
     const marks = [];
     for (const row of rows(one('#marks', document))) {
@@ -174,8 +187,11 @@ function parseMarks(document, drift) {
         if (name && date && value && !rest.length) {
             marks.push({ name: text(name), date: text(date), value: text(value), comment: null });
         }
-        else if (name && !date && last) {
-            last.comment = text(name).replace(/^[^:]*:\s*/, '') || null;
+        else if (last &&
+            name &&
+            !value &&
+            (!date || (!text(name) && attr(date, 'colspan') === '2'))) {
+            last.comment = text(date ?? name).replace(/^[^:]*:\s*/, '') || last.comment;
         }
         else
             drift('A mark row has an unknown shape.');
@@ -263,8 +279,12 @@ function hours(table, drift) {
 function teacher(element) {
     const title = (attr(element, 'title') ?? '').replace(/\s*\(([^)]*)\)\s*$/, '');
     const code = text(element) || /\(([^)]*)\)\s*$/.exec(attr(element, 'title') ?? '')?.[1] || null;
-    const [lastName, firstName] = title.split(',').map((part) => part.trim());
-    return { code, firstName: firstName || null, lastName: lastName || null };
+    const [lastName = '', ...firstNames] = title.split(',');
+    return {
+        code,
+        firstName: firstNames.join(',').trim() || null,
+        lastName: lastName.trim() || null
+    };
 }
 function file(element) {
     const size = text(one('small', element)).replace(/^\(|\)$/g, '');
@@ -277,7 +297,7 @@ function file(element) {
 function periods(label, drift) {
     if (!label)
         return null;
-    const match = /(\d+)\.(?:\s*-\s*(\d+)\.)?\s*Stunde/.exec(label);
+    const match = /^(\d+)\.?(?:\s*[-–]\s*(\d+)\.?)?(?:\s*Stunden?)?$/.exec(label.trim());
     if (!match) {
         drift('A history row has unreadable periods.');
         return null;

package/dist/apps/lessons/types.d.ts

@@ -92,8 +92,8 @@ export interface Course extends CourseRef {
     marks: Mark[];
     exams: Exam[];
     attendance: Record<string, number>;
-    /** Whether the portal links this course's first semester. */
-    hasFirstSemester: boolean;
+    /** Id the portal links for this course's first semester; read it with `course(id, { semester: 1 })`. */
+    firstSemester: string | null;
 }
 export interface EntryRef {
     course: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ranzenjs/client",
-	"version": "0.1.0",
+	"version": "0.2.1",
 	"description": "Typed client for Schulportal Hessen (SPH, LANIS)",
 	"license": "MIT",
 	"author": "Suko",