@wirecat/cli-core 0.538.0 → 0.539.0

package/dist/errors/reasons.js

@@ -62,6 +62,13 @@ const OTHERS = [
     validation("event.repeat-split", "the series cannot be split at this occurrence, or was split there already"),
     validation("event.repeat-count", "a COUNT series is split only with a rule for its new part"),
     validation("event.unmovable", "the provider keeps this kind of event on its calendar"),
+    validation("event.text-with-fields", "--text takes the whole event from its line, so no field option goes with it"),
+    validation("calendar.ambiguous", "two or more calendars have this name; name one by its id"),
+    validation("export.too-many", "the query finds more events than one export writes"),
+    validation("ics.not-icalendar", "the file is not iCalendar"),
+    validation("ics.no-events", "the file holds no event that can be imported"),
+    validation("ics.too-many", "the file holds more events than one import sends"),
+    validation("ics.too-large", "the file is larger than one import reads"),
     ["calendar.read-only", "permission_error", "the calendar takes no new events from this account"],
     ["calendar.unsynced", "not_found", "the calendar account has no synced calendar in the store"],
     ["calendar.sync-incomplete", "not_found", "a synced calendar's sync never finished or is mid-round"],

package/dist/meetings/event-store.d.ts

@@ -204,7 +204,13 @@ export interface EventFilter {
     accountId?: number;
     /** Several accounts' events at once, in place of `accountId`. */
     accountIds?: readonly number[];
+    /** Only this event. */
+    id?: number;
     calendarId?: number;
+    /** Events with a copy, in the accounts read, of this kind; a copy stored with no kind is `default`. */
+    eventType?: EntryEventType;
+    /** Events with no copy, in the accounts read, of any of these kinds. */
+    notEventTypes?: readonly EntryEventType[];
     /** Events whose entries list one of this person's contacts. */
     personId?: number;
     /** Latest start first; earliest first when absent. */

package/dist/meetings/testing/event-store-contract.js

@@ -383,6 +383,21 @@ export const eventStoreContract = (make) => {
             assert.equal((await store.events({ ...window, accountIds: [fixture.accountId, fixture.otherAccountId] })).length, 3);
             assert.equal((await store.events({ ...window, accountIds: [fixture.otherAccountId] })).length, 1);
         }),
+        test("events filter by the kind of their copies; a copy with no kind is default", async ({ store, calendar }) => {
+            const at = later;
+            await store.saveEntries(calendar, [
+                single("meeting", at, { title: "meeting" }),
+                single("plain", at + HOUR, { title: "plain", eventType: "default" }),
+                single("cake", at + 2 * HOUR, { title: "cake", eventType: "birthday" }),
+                single("deep", at + 3 * HOUR, { title: "deep", eventType: "focus" }),
+            ], 2);
+            const window = { from: at - HOUR, to: at + 8 * HOUR };
+            const titles = async (filter) => (await store.events({ ...window, ...filter })).map(({ title }) => title);
+            assert.deepEqual(await titles({ eventType: "default" }), ["meeting", "plain"]);
+            assert.deepEqual(await titles({ eventType: "birthday" }), ["cake"]);
+            assert.deepEqual(await titles({ notEventTypes: ["birthday", "focus"] }), ["meeting", "plain"]);
+            assert.deepEqual(await titles({ eventType: "default", notEventTypes: ["default"] }), []);
+        }),
         test("participants are kept by address; a room is listed and is no contact", async ({ store, calendar }) => {
             const [entry] = await store.saveEntries(calendar, [
                 single("a", later, {

package/dist/store/sqlite/calendar-events.js

@@ -43,6 +43,10 @@ export const listEvents = (database, filter) => {
         clauses.push("e.starts_at >= ?");
         params.push(filter.startsFrom - DAY);
     }
+    if (filter.id !== undefined) {
+        clauses.push("e.id = ?");
+        params.push(filter.id);
+    }
     if (filter.calendarId !== undefined) {
         clauses.push(entries("ce.calendar_id = ?"));
         params.push(filter.calendarId);
@@ -57,6 +61,17 @@ export const listEvents = (database, filter) => {
     };
     if (accounts !== undefined)
         clauses.push(entries(inAccounts("c.account_id")));
+    // A copy's kind counts only in the accounts read: another account's copy of the same meeting is its own.
+    const ofKind = (kinds) => {
+        for (const kind of kinds)
+            params.push(kind);
+        const scope = accounts === undefined ? "" : ` AND ${inAccounts("c.account_id")}`;
+        return entries(`coalesce(ce.event_type, 'default') IN (${kinds.map(() => "?").join(", ")})${scope}`);
+    };
+    if (filter.eventType !== undefined)
+        clauses.push(ofKind([filter.eventType]));
+    if (filter.notEventTypes?.length)
+        clauses.push(`NOT ${ofKind(filter.notEventTypes)}`);
     if (filter.personId !== undefined) {
         clauses.push(entries("EXISTS (SELECT 1 FROM calendar_entry_participants p JOIN identity_links il ON il.identity_id = p.identity_id " +
             "WHERE p.entry_id = ce.id AND il.person_id = ?)"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirecat/cli-core",
-  "version": "0.538.0",
+  "version": "0.539.0",
   "description": "The messenger-neutral half of a messaging CLI: domain model, message locators, rendering, name resolution, the SQLite seam, the command skeleton and shared read commands, the send guard, run records and the message store",
   "license": "Apache-2.0",
   "author": "Viacheslav Ptsarev",