@wilm-ai/wilma-cli 1.5.0 → 1.5.2

package/dist/index.js

@@ -1008,37 +1008,52 @@ function currentWeekBounds() {
     return [fmt(monday), fmt(friday)];
 }
 const DAY_NAMES = ["Su", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-async function outputSchedule(client, opts) {
-    const overview = await client.overview.get();
+function resolveScheduleDateSelection(opts) {
     const when = opts.when || "week";
-    let startDate;
-    let endDate;
     if (opts.date && opts.weekday) {
         console.error("Use either --date or --weekday, not both.");
         process.exit(1);
     }
     if (opts.date) {
         const parsed = parseIsoDateOrExit(opts.date);
-        startDate = endDate = parsed;
+        return {
+            when,
+            startDate: parsed,
+            endDate: parsed,
+            queryDate: parsed,
+            outputWhen: "date",
+        };
     }
-    else if (opts.weekday) {
+    if (opts.weekday) {
         const parsed = nextDateForWeekday(opts.weekday);
-        startDate = endDate = parsed;
-    }
-    else if (when === "today") {
-        startDate = endDate = todayString();
+        return {
+            when,
+            startDate: parsed,
+            endDate: parsed,
+            queryDate: parsed,
+            outputWhen: "weekday",
+        };
     }
-    else if (when === "tomorrow") {
-        startDate = endDate = nextSchoolDay();
+    if (when === "today") {
+        const date = todayString();
+        return { when, startDate: date, endDate: date, outputWhen: when };
     }
-    else {
-        [startDate, endDate] = currentWeekBounds();
+    if (when === "tomorrow") {
+        const date = nextSchoolDay();
+        return { when, startDate: date, endDate: date, outputWhen: when };
     }
-    const lessons = overview.schedule.filter((l) => l.date >= startDate && l.date <= endDate);
+    const [startDate, endDate] = currentWeekBounds();
+    return { when, startDate, endDate, outputWhen: when };
+}
+async function outputSchedule(client, opts) {
+    const selection = resolveScheduleDateSelection(opts);
+    const { when, startDate, endDate } = selection;
+    const schedule = await client.schedule.list(selection.queryDate ? { date: selection.queryDate } : undefined);
+    const lessons = schedule.filter((l) => l.date >= startDate && l.date <= endDate);
     if (opts.json) {
         const result = !opts.date && !opts.weekday && when === "week"
             ? { when, weekStart: startDate, weekEnd: endDate, lessons }
-            : { when: opts.date ? "date" : (opts.weekday ? "weekday" : when), date: startDate, lessons };
+            : { when: selection.outputWhen, date: startDate, lessons };
         console.log(JSON.stringify(result, null, 2));
         return;
     }
@@ -1673,31 +1688,25 @@ async function outputAllOverviewCommand(profile, config, command, flags, onMfa)
         }
         return;
     }
+    const scheduleSelection = command === "schedule"
+        ? resolveScheduleDateSelection(flags)
+        : null;
     const results = [];
     for (const student of students) {
         const client = await WilmaClient.login({ ...profile, studentNumber: student.studentNumber }, onMfa);
-        const overview = await client.overview.get();
-        if (command === "schedule") {
-            const when = flags.when || "week";
-            let startDate, endDate;
-            if (when === "today") {
-                startDate = endDate = todayString();
-            }
-            else if (when === "tomorrow") {
-                startDate = endDate = nextSchoolDay();
-            }
-            else {
-                [startDate, endDate] = currentWeekBounds();
-            }
+        if (command === "schedule" && scheduleSelection) {
+            const schedule = await client.schedule.list(scheduleSelection.queryDate ? { date: scheduleSelection.queryDate } : undefined);
             results.push({
                 student,
-                data: overview.schedule.filter((l) => l.date >= startDate && l.date <= endDate),
+                data: schedule.filter((l) => l.date >= scheduleSelection.startDate && l.date <= scheduleSelection.endDate),
             });
         }
         else if (command === "homework") {
+            const overview = await client.overview.get();
             results.push({ student, data: overview.homework.slice(0, flags.limit ?? 10) });
         }
         else if (command === "grades") {
+            const overview = await client.overview.get();
             results.push({ student, data: overview.grades.slice(0, flags.limit ?? 20) });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-cli",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,9 +8,17 @@
     "wilmai": "dist/index.js",
     "wilma": "dist/index.js"
   },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "lint": "echo 'add lint'",
+    "test": "echo 'add tests'",
+    "start": "node dist/index.js",
+    "prepack": "pnpm --filter @wilm-ai/wilma-client build && pnpm --filter @wilm-ai/wilma-cli build",
+    "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs"
+  },
   "dependencies": {
     "@inquirer/prompts": "^5.3.8",
-    "@wilm-ai/wilma-client": "^1.4.0"
+    "@wilm-ai/wilma-client": "workspace:^"
   },
   "devDependencies": {
     "typescript": "^5.6.3"
@@ -21,12 +29,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "lint": "echo 'add lint'",
-    "test": "echo 'add tests'",
-    "start": "node dist/index.js",
-    "test:live": "tsc -p tsconfig.json && node test/live.spec.mjs"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Wilm.ai
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.