@geekity/cms 0.30.0 → 0.32.0

package/dist/{admin/accounts.d.ts → site/users.d.ts}

@@ -1,5 +1,4 @@
 import type { AdminTheme } from './admin-theme.ts';
-import type { AdminStore } from './store.ts';
 /**
  * Who may sign in: `data/users.json`, and everything that reads or writes it.
  *
@@ -15,16 +14,7 @@ import type { AdminStore } from './store.ts';
  * something to hand a reader or a mirror. The file is written 0600 for the
  * same reason; it sits directly in `dataDir`, so there is no private directory
  * around it to lean on.
- *
- * Reads are synchronous and per call, exactly as `readSiteSettings` reads
- * `site.json` per call: the file is a few hundred bytes and nothing anywhere
- * can then be holding a stale copy of who exists. Writes go through
- * {@link updateFileAtomically}, which puts the read inside the same queue as
- * the write, so the uniqueness rule that used to be a `UNIQUE` index is
- * checked and acted on as one step.
  */
-/** The file, relative to `dataDir`. */
-export declare const USERS_FILE = "users.json";
 /** The permissions the file is written with: nobody but the site's own user. */
 export declare const USERS_FILE_MODE = 384;
 /** Where the users file lives for a given data directory. */
@@ -52,7 +42,7 @@ export interface User {
      *
      * Absent for almost everybody, because it holds only what somebody actually
      * changed: an event nothing says anything about is at the default
-     * `src/notifications/preferences.ts` gives it, which is what lets a new
+     * `src/site/notification-preferences.ts` gives it, which is what lets a new
      * notice start working without anybody visiting the users screen. Keyed by
      * event name, so adding an event adds no field here.
      */
@@ -168,6 +158,8 @@ export interface CreateUserInput {
     password: string;
     /** Where to reach them. Left off, or empty, is a user with no email. */
     email?: string | undefined;
+    /** When the account is created. Defaults to the system clock. */
+    now?: Date | undefined;
 }
 /** Thrown when a username is already taken. Usernames are the login key. */
 export declare class DuplicateUsernameError extends Error {
@@ -229,6 +221,8 @@ export declare function findUserByIdentifier(dataDir: string, identifier: string
  * first one's work and is refused.
  */
 export declare function createUser(input: CreateUserInput): Promise<User>;
+export type UserChange = Partial<Omit<StoredUser, 'id' | 'username' | 'createdAt'>>;
+export declare function updateUser(dataDir: string, userId: number, change: (user: StoredUser, everyone: readonly StoredUser[]) => UserChange): Promise<boolean>;
 /**
  * Hash a new password and put it on a user, replacing the old one. Returns
  * `false` when there is no such user. Sessions are left alone; deciding which
@@ -360,8 +354,8 @@ export declare class ConflictingActorIdError extends Error {
  *
  * The id has to be unique across the file, and the check is inside the write
  * for the reason {@link createUser}'s duplicate check is: it is a rule about
- * the file rather than about one user. Returns whether anything changed, so a
- * second run with the same id writes nothing.
+ * the file rather than about one user. Returns whether the id
+ * changed, so a second run with the same id reports nothing new.
  */
 export declare function setUserActorId(input: {
     /** Which site's users file to write. */
@@ -378,18 +372,7 @@ export declare class UnknownUserError extends Error {
     readonly username: string;
     constructor(username: string);
 }
-/**
- * Take a user out of the file. Returns `false` when there was nothing to take.
- *
- * Their IndieAuth tokens go with them (TASK-160): a token is a file in
- * `data/` too, so it is revoked here, where every caller deletes a user.
- *
- * Their sessions are not ended here: sessions are in the database, and the
- * screen that deletes a user ends them itself. A session that outlives this —
- * one in a database restored from a backup, say — names a user the file no
- * longer holds, and the admin guard turns that into no session at all.
- */
-export declare function deleteUser(input: {
+export declare function removeUserRecord(input: {
     dataDir: string;
     userId: number;
 }): Promise<boolean>;
@@ -398,28 +381,20 @@ export declare function deleteUser(input: {
  * there is no such user. The two failures are deliberately indistinguishable.
  */
 export declare function verifyUserPassword(dataDir: string, username: string, password: string): User | undefined;
-/**
- * Turn an older site's users rows into `data/users.json`, once, and drop the
- * table.
- *
- * TASK-9 put the accounts in SQLite; decision-9 made the database disposable,
- * and a site upgrading across the two has rows nothing would ever read again.
- * So the first boot of this version writes them out — ids and hashes exactly
- * as they stand, because a session names its user by id and a hash is not
- * something to re-encode on the way past.
- *
- * The file wins, as it does everywhere else: a `users.json` that is already
- * there is left alone, so a database restored from a backup taken before the
- * upgrade cannot bring deleted accounts back or undo a password change. The
- * table is dropped either way, because a fresh database gets it from migration
- * 1 — which has shipped, and so is never edited — and a site that has been
- * migrated must not be asked again.
- *
- * Synchronous because `createCms` is: it runs before the server is listening
- * and before anything else has touched the file.
- */
-export declare function migrateUsersToFile(options: {
-    admin: AdminStore;
-    dataDir: string;
-}): void;
-//# sourceMappingURL=accounts.d.ts.map
+/** The file as it is on disk: the users, and the next id to hand out. */
+export interface UsersFileContents {
+    /** Everyone who may sign in, in the order the file lists them. */
+    users: StoredUser[];
+    /**
+     * The id the next user gets.
+     *
+     * Kept rather than derived from the highest id in use, so that deleting a
+     * user and adding another never hands the new one the old one's id: a
+     * session, or anything else naming a user by id, can then only ever mean the
+     * person it was written for.
+     */
+    nextId: number;
+}
+/** The bytes of the file, as it is written. */
+export declare function usersJsonText(contents: UsersFileContents): string;
+//# sourceMappingURL=users.d.ts.map

package/dist/site/users.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"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"}

package/dist/{admin/accounts.js → site/users.js}

@@ -1,10 +1,11 @@
-import path from 'node:path';
-import { readFileIfPresentSync, updateFileAtomically, writeFileAtomicallySync, } from '../files/atomic.js';
-import { revokeTokensForUser } from '../indieauth/tokens.js';
-import { deliveryMode, notificationEvent, withNotification, withNotificationMode, } from '../notifications/preferences.js';
-import { relText } from '../web/navigation.js';
 import { adminTheme } from './admin-theme.js';
+import { readFileIfPresentSync, updateFileAtomically } from '../files/atomic.js';
+import { deliveryMode, notificationEvent, withNotification, withNotificationMode, } from './notification-preferences.js';
+import { systemClock } from '../util/clock.js';
+import { messageOf } from '../util/errors.js';
+import { relText } from './navigation.js';
 import { hashPassword, verifyPasswordHash } from './passwords.js';
+import { USERS, dataPath } from '../files/data-files.js';
 /**
  * Who may sign in: `data/users.json`, and everything that reads or writes it.
  *
@@ -20,21 +21,12 @@ import { hashPassword, verifyPasswordHash } from './passwords.js';
  * something to hand a reader or a mirror. The file is written 0600 for the
  * same reason; it sits directly in `dataDir`, so there is no private directory
  * around it to lean on.
- *
- * Reads are synchronous and per call, exactly as `readSiteSettings` reads
- * `site.json` per call: the file is a few hundred bytes and nothing anywhere
- * can then be holding a stale copy of who exists. Writes go through
- * {@link updateFileAtomically}, which puts the read inside the same queue as
- * the write, so the uniqueness rule that used to be a `UNIQUE` index is
- * checked and acted on as one step.
  */
-/** The file, relative to `dataDir`. */
-export const USERS_FILE = 'users.json';
 /** The permissions the file is written with: nobody but the site's own user. */
 export const USERS_FILE_MODE = 0o600;
 /** Where the users file lives for a given data directory. */
 export function usersFile(dataDir) {
-    return path.join(dataDir, USERS_FILE);
+    return dataPath(dataDir, USERS);
 }
 /** Thrown when a username is already taken. Usernames are the login key. */
 export class DuplicateUsernameError extends Error {
@@ -137,7 +129,7 @@ export async function createUser(input) {
             // and the file says only what somebody actually filled in.
             ...(email === '' ? {} : { email }),
             passwordHash: hash,
-            createdAt: new Date().toISOString(),
+            createdAt: (input.now ?? systemClock()).toISOString(),
         };
         return { users: [...contents.users, created], nextId: contents.nextId + 1 };
     });
@@ -146,6 +138,21 @@ export async function createUser(input) {
         throw new Error('The user was not written.');
     return withoutHash(created);
 }
+export async function updateUser(dataDir, userId, change) {
+    let found = false;
+    await write(dataDir, (contents) => ({
+        ...contents,
+        users: contents.users.map((user) => {
+            if (user.id !== userId)
+                return user;
+            found = true;
+            // A key the change sets to `undefined` is dropped by JSON.stringify on
+            // the way to disk, which is how an optional field comes off the file.
+            return { ...user, ...change(user, contents.users) };
+        }),
+    }));
+    return found;
+}
 /**
  * Hash a new password and put it on a user, replacing the old one. Returns
  * `false` when there is no such user. Sessions are left alone; deciding which
@@ -155,15 +162,7 @@ export async function setUserPassword(input) {
     // Hashed before the write rather than inside it, so a hash that throws
     // leaves the stored one alone.
     const hash = hashPassword(input.password);
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => user.id === input.userId ? { ...user, passwordHash: hash } : user),
-        };
-    });
-    return changed;
+    return updateUser(input.dataDir, input.userId, () => ({ passwordHash: hash }));
 }
 /**
  * Put an email address on a user, or take the one they had off.
@@ -176,20 +175,9 @@ export async function setUserPassword(input) {
  */
 export async function setUserEmail(input) {
     const email = input.email.trim();
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => {
-                if (user.id !== input.userId)
-                    return user;
-                const { email: _removed, ...rest } = user;
-                return email === '' ? rest : { ...rest, email };
-            }),
-        };
-    });
-    return changed;
+    return updateUser(input.dataDir, input.userId, () => ({
+        email: email === '' ? undefined : email,
+    }));
 }
 /**
  * Write a user's profile, replacing whatever was there.
@@ -202,21 +190,8 @@ export async function setUserEmail(input) {
  * there is no such user.
  */
 export async function setUserProfile(input) {
-    const next = cleanProfile(input.profile);
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => {
-                if (user.id !== input.userId)
-                    return user;
-                const { profile: _removed, ...rest } = user;
-                return next === undefined ? rest : { ...rest, profile: next };
-            }),
-        };
-    });
-    return changed;
+    const profile = cleanProfile(input.profile);
+    return updateUser(input.dataDir, input.userId, () => ({ profile }));
 }
 /**
  * A profile with the empties taken out, or `undefined` when nothing is left.
@@ -262,21 +237,9 @@ export function cleanProfile(profile) {
  * `false` when there is no such user.
  */
 export async function setUserNotification(input) {
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => {
-                if (user.id !== input.userId)
-                    return user;
-                const { notifications: _removed, ...rest } = user;
-                const next = withNotification(user.notifications, input.event, input.on);
-                return next === undefined ? rest : { ...rest, notifications: next };
-            }),
-        };
-    });
-    return changed;
+    return updateUser(input.dataDir, input.userId, (user) => ({
+        notifications: withNotification(user.notifications, input.event, input.on),
+    }));
 }
 /**
  * Say how often one notice reaches one user.
@@ -289,21 +252,9 @@ export async function setUserNotification(input) {
  * Returns `false` when there is no such user.
  */
 export async function setUserNotificationMode(input) {
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => {
-                if (user.id !== input.userId)
-                    return user;
-                const { notificationModes: _removed, ...rest } = user;
-                const next = withNotificationMode(user.notificationModes, input.event, input.mode);
-                return next === undefined ? rest : { ...rest, notificationModes: next };
-            }),
-        };
-    });
-    return changed;
+    return updateUser(input.dataDir, input.userId, (user) => ({
+        notificationModes: withNotificationMode(user.notificationModes, input.event, input.mode),
+    }));
 }
 /**
  * Set the theme a user draws the admin in, or take it off with `undefined`,
@@ -311,20 +262,7 @@ export async function setUserNotificationMode(input) {
  * such user.
  */
 export async function setUserAdminTheme(input) {
-    let changed = false;
-    await write(input.dataDir, (contents) => {
-        changed = contents.users.some((user) => user.id === input.userId);
-        return {
-            ...contents,
-            users: contents.users.map((user) => {
-                if (user.id !== input.userId)
-                    return user;
-                const { adminTheme: _removed, ...rest } = user;
-                return input.theme === undefined ? rest : { ...rest, adminTheme: input.theme };
-            }),
-        };
-    });
-    return changed;
+    return updateUser(input.dataDir, input.userId, () => ({ adminTheme: input.theme }));
 }
 /**
  * Thrown when the id being set already belongs to somebody else.
@@ -352,27 +290,24 @@ export class ConflictingActorIdError extends Error {
  *
  * The id has to be unique across the file, and the check is inside the write
  * for the reason {@link createUser}'s duplicate check is: it is a rule about
- * the file rather than about one user. Returns whether anything changed, so a
- * second run with the same id writes nothing.
+ * the file rather than about one user. Returns whether the id
+ * changed, so a second run with the same id reports nothing new.
  */
 export async function setUserActorId(input) {
+    const mine = findUser(input.dataDir, input.username);
+    if (mine === undefined)
+        throw new UnknownUserError(input.username);
     let changed = false;
-    await write(input.dataDir, (contents) => {
-        const mine = contents.users.find((user) => user.username === input.username);
-        if (mine === undefined)
-            throw new UnknownUserError(input.username);
-        const holder = contents.users.find((user) => user.id !== mine.id && user.actorId === input.actorId);
+    const found = await updateUser(input.dataDir, mine.id, (user, everyone) => {
+        const holder = everyone.find((other) => other.id !== user.id && other.actorId === input.actorId);
         if (holder !== undefined) {
             throw new ConflictingActorIdError(holder.username, `The actor id ${input.actorId}`);
         }
-        changed = mine.actorId !== input.actorId;
-        if (!changed)
-            return contents;
-        return {
-            ...contents,
-            users: contents.users.map((user) => user.id === mine.id ? { ...user, actorId: input.actorId } : user),
-        };
+        changed = user.actorId !== input.actorId;
+        return { actorId: input.actorId };
     });
+    if (!found)
+        throw new UnknownUserError(input.username);
     return changed;
 }
 /** Thrown when a command names a user this site does not have. */
@@ -385,24 +320,12 @@ export class UnknownUserError extends Error {
         this.username = username;
     }
 }
-/**
- * Take a user out of the file. Returns `false` when there was nothing to take.
- *
- * Their IndieAuth tokens go with them (TASK-160): a token is a file in
- * `data/` too, so it is revoked here, where every caller deletes a user.
- *
- * Their sessions are not ended here: sessions are in the database, and the
- * screen that deletes a user ends them itself. A session that outlives this —
- * one in a database restored from a backup, say — names a user the file no
- * longer holds, and the admin guard turns that into no session at all.
- */
-export async function deleteUser(input) {
+export async function removeUserRecord(input) {
     let deleted = false;
     await write(input.dataDir, (contents) => {
         deleted = contents.users.some((user) => user.id === input.userId);
         return { ...contents, users: contents.users.filter((user) => user.id !== input.userId) };
     });
-    await revokeTokensForUser(input.dataDir, input.userId);
     return deleted;
 }
 /**
@@ -421,44 +344,6 @@ export function verifyUserPassword(dataDir, username, password) {
         return undefined;
     return withoutHash(user);
 }
-/**
- * Turn an older site's users rows into `data/users.json`, once, and drop the
- * table.
- *
- * TASK-9 put the accounts in SQLite; decision-9 made the database disposable,
- * and a site upgrading across the two has rows nothing would ever read again.
- * So the first boot of this version writes them out — ids and hashes exactly
- * as they stand, because a session names its user by id and a hash is not
- * something to re-encode on the way past.
- *
- * The file wins, as it does everywhere else: a `users.json` that is already
- * there is left alone, so a database restored from a backup taken before the
- * upgrade cannot bring deleted accounts back or undo a password change. The
- * table is dropped either way, because a fresh database gets it from migration
- * 1 — which has shipped, and so is never edited — and a site that has been
- * migrated must not be asked again.
- *
- * Synchronous because `createCms` is: it runs before the server is listening
- * and before anything else has touched the file.
- */
-export function migrateUsersToFile(options) {
-    const { admin, dataDir } = options;
-    const rows = admin.legacyUsers();
-    const file = usersFile(dataDir);
-    if (rows !== undefined && rows.length > 0 && readFileIfPresentSync(file) === undefined) {
-        const users = rows.map((row) => ({
-            id: row.id,
-            username: row.username,
-            passwordHash: row.passwordHash,
-            createdAt: row.createdAt,
-        }));
-        const highest = users.reduce((top, user) => Math.max(top, user.id), 0);
-        writeFileAtomicallySync(file, usersJsonText({ users, nextId: highest + 1 }), {
-            mode: USERS_FILE_MODE,
-        });
-    }
-    admin.dropLegacyTable('users');
-}
 /** A user as a screen may render it: everything but the hash. */
 function withoutHash(user) {
     return {
@@ -479,7 +364,7 @@ function withoutHash(user) {
  */
 const DUMMY_HASH = hashPassword('a password no user has, hashed once so that verification is constant time');
 /** The bytes of the file, as it is written. */
-function usersJsonText(contents) {
+export function usersJsonText(contents) {
     return `${JSON.stringify(contents, null, 2)}\n`;
 }
 /**
@@ -680,7 +565,7 @@ function notificationModesFrom(value) {
 }
 /** What a damaged users file says, and what to do about it. */
 function unusableUsersFile(file, cause) {
-    const reason = cause instanceof Error ? cause.message : String(cause);
+    const reason = messageOf(cause);
     return new Error(`The users file ${file} could not be read: ${reason} It has deliberately not been ` +
         'replaced, because a site with no users offers first-run setup to whoever reaches it ' +
         'first. Restore the file from a backup, or delete it on purpose to start again.');
@@ -690,4 +575,4 @@ function write(dataDir, produce) {
     const file = usersFile(dataDir);
     return updateFileAtomically(file, (current) => usersJsonText(produce(parseUsersFile(current, file))), { mode: USERS_FILE_MODE });
 }
-//# sourceMappingURL=accounts.js.map
+//# sourceMappingURL=users.js.map

package/dist/site/users.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"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"}

package/dist/store/admin-store.d.ts

@@ -0,0 +1,72 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { Clock } from '../util/clock.ts';
+import type { CommentStore } from './comments.ts';
+import type { ConversationEvents } from './conversation.ts';
+import type { DeliveryStore } from './deliveries.ts';
+import type { FollowerStore } from './followers.ts';
+import type { InboxStore } from './inbox.ts';
+import type { ProfileStore } from './profiles.ts';
+import type { RelayStore } from './relays.ts';
+import type { SessionStore } from './sessions.ts';
+import type { StateStore } from './state.ts';
+import type { TokenStore } from './tokens.ts';
+import type { WebmentionStore } from './webmentions.ts';
+export { COMMENT_KINDS, COMMENT_SOURCES, COMMENT_STATUSES, importedFields, REDACTED_FIELDS, rsvpField, viaField, } from './comments.ts';
+export type { CommentAuthor, CommentContent, CommentKind, CommentRecord, CommentSource, CommentStatus, ListCommentsOptions, PostComment, RedactedField, } from './comments.ts';
+export type { ConversationWrite } from './conversation.ts';
+export { DELIVERY_STATUSES } from './deliveries.ts';
+export type { Delivery, DeliveryStatus, NewDelivery } from './deliveries.ts';
+export type { Follower, NewFollower } from './followers.ts';
+export type { InboxActivity, NewInboxActivity } from './inbox.ts';
+export type { ActorProfile, StoredActorProfile } from './profiles.ts';
+export { RELAY_STATES } from './relays.ts';
+export type { NewRelay, Relay, RelayState } from './relays.ts';
+export type { ListPageOptions } from './rows.ts';
+export { openAdminDatabase } from './schema.ts';
+export { SESSION_ID_BYTES } from './sessions.ts';
+export type { CreateSessionInput, FlashKind, FlashMessage, Session } from './sessions.ts';
+export type { CreatePasswordResetInput, IssuedPasswordReset, PasswordReset } from './tokens.ts';
+export { WEBMENTION_SEND_STATUSES } from './webmentions.ts';
+export type { NewSentWebmention, SentWebmention, WebmentionSendStatus } from './webmentions.ts';
+/** Where {@link openAdminStore} puts, and finds, its tables. */
+export interface OpenAdminStoreOptions {
+    /** Directory the database lives in. Created if it is missing. */
+    dataDir: string;
+    /** What the records are stamped with. Defaults to the system clock. */
+    now?: Clock | undefined;
+}
+/**
+ * Everything the database holds that is not the content index: the sessions,
+ * the followers and inbox indexes, the delivery outcomes, the relay handshake
+ * and the scheduler's watermark.
+ *
+ * All of it is a cache (decision-9). The followers and the inbox rows are read
+ * back from `content/_data/federation/` on every boot; the rest a site is free
+ * to lose, and docs/content.md says what losing it costs. It is deliberately
+ * not part of the {@link ContentStore}: the two share the file, one database per
+ * site with a migration ledger each, and nothing else.
+ */
+export type AdminStore = SessionStore & TokenStore & StateStore & FollowerStore & ProfileStore & InboxStore & CommentStore & ConversationEvents & DeliveryStore & WebmentionStore & RelayStore & {
+    /** Absolute path of the SQLite file, the same one the content index uses. */
+    readonly file: string;
+    /** What the records are stamped with: the clock the store was opened with. */
+    now(): Date;
+    /**
+     * Refuse every write on this connection while on, with SQLite's
+     * `query_only`. A worker handing over to a new one under `geekity serve`
+     * turns it on, so the new worker's boot migrations run alone (TASK-288).
+     */
+    setReadOnly(readOnly: boolean): void;
+    /** Close the database. Safe to call twice. */
+    close(): void;
+};
+/**
+ * Open (and if needed create) the admin tables in `dataDir`, applying every
+ * migration the package ships. Applying them is idempotent.
+ *
+ * The connection is its own; SQLite in WAL mode is happy with the content
+ * index holding a second one on the same file.
+ */
+export declare function openAdminStore(options: OpenAdminStoreOptions): AdminStore;
+export declare function adminStoreOwning(db: DatabaseSync, file: string, now: Clock): AdminStore;
+//# sourceMappingURL=admin-store.d.ts.map

package/dist/store/admin-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin-store.d.ts","sourceRoot":"","sources":["../../src/store/admin-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EACL,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,SAAS,EACT,QAAQ,GACT,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,WAAW,EACX,aAAa,GACd,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC7E,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC5D,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAClE,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC1F,YAAY,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEhG,gEAAgE;AAChE,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,UAAU,GAAG,YAAY,GACnC,UAAU,GACV,UAAU,GACV,aAAa,GACb,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,kBAAkB,GAClB,aAAa,GACb,eAAe,GACf,UAAU,GAAG;IACX,6EAA6E;IAC7E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,GAAG,IAAI,IAAI,CAAC;IACZ;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACrC,8CAA8C;IAC9C,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEJ;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,UAAU,CAOzE;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,UAAU,CA+BvF"}