@geekity/cms 0.29.0 → 0.31.0

package/dist/admin/legacy-migrations.js

@@ -0,0 +1,235 @@
+import { statSync } from 'node:fs';
+import { actorKeyFile, ensureKeysDir, KEY_FILE_MODE } from '../federation/keys.js';
+import { readFileIfPresentSync, writeFileAtomicallySync } from '../files/atomic.js';
+import { relayList } from '../site/setting-values.js';
+import { parseSiteJson, settingsFromSiteJson, siteDataPath, siteJsonText, } from '../site/site-json.js';
+import { USERS_FILE_MODE, usersFile, usersJsonText } from '../site/users.js';
+import { DEFAULT_MENU_NAME, menuItemsFromText } from '../site/navigation.js';
+import { taxonomyRedirectsOf } from '../content/taxonomy.js';
+export function legacySettings(db) {
+    // Prepared here, after the check, because a statement over a missing table
+    // throws when it is prepared rather than when it is run.
+    if (!hasTable(db, 'settings'))
+        return undefined;
+    return db.prepare('SELECT key, value, updated_at FROM settings').all().map((row) => ({
+        key: String(row['key']),
+        value: String(row['value']),
+        updatedAt: String(row['updated_at']),
+    }));
+}
+export function legacyActorKeys(db) {
+    if (!hasTable(db, 'actor_keys'))
+        return undefined;
+    return db.prepare('SELECT identifier, algorithm, private_jwk FROM actor_keys').all().map((row) => ({
+        identifier: String(row['identifier']),
+        algorithm: String(row['algorithm']),
+        privateJwk: String(row['private_jwk']),
+    }));
+}
+export function legacyUsers(db) {
+    if (!hasTable(db, 'users'))
+        return undefined;
+    return db
+        .prepare('SELECT id, username, password_hash, created_at FROM users ORDER BY id')
+        .all().map((row) => ({
+        id: Number(row['id']),
+        username: String(row['username']),
+        passwordHash: String(row['password_hash']),
+        createdAt: String(row['created_at']),
+    }));
+}
+/**
+ * Drop a table whose contents this version keeps in files instead.
+ *
+ * Called once the rows have been written out, and safe when the table is
+ * already gone. It is deliberately not a schema migration: a migration runs
+ * when the database is opened, which is before anything knows where the
+ * content directory is, and dropping the rows before they are written out is
+ * the one mistake this cannot make.
+ */
+export function dropLegacyTable(db, name) {
+    // The name is never a caller's to invent: it is one of this file's own
+    // shipped table names, so quoting it is enough.
+    db.exec(`DROP TABLE IF EXISTS "${name.replace(/"/g, '""')}"`);
+}
+/** Whether the database has a table by that name. */
+function hasTable(db, name) {
+    return (db.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?").all(name)
+        .length > 0);
+}
+/**
+ * Turn an older site's settings rows into `content/_data/site.json`, once, and
+ * drop the table.
+ *
+ * TASK-14 made SQLite the source and the file its mirror; decision-9 reversed
+ * that, and a site upgrading across the two has rows nothing would ever read
+ * again. So the first boot of this version writes them out. Which side wins
+ * when both have something to say is decided the way it is decided everywhere
+ * else: the file wins when it was written after the last save, because that is
+ * a hand edit or a restored checkout, and the rows win otherwise. Either way
+ * the actor handle and type come from the rows, because `site.json` never
+ * carried them and losing them would rename the site's actor.
+ *
+ * Synchronous because `createCms` is: it runs before the server is listening
+ * and before anything else has touched the file.
+ */
+export function migrateSettingsToFile(db, contentDir) {
+    const rows = legacySettings(db);
+    if (rows !== undefined && rows.length > 0) {
+        const stored = settingsFromRows(rows);
+        const file = siteDataPath(contentDir);
+        const existing = parseSiteJson(readFileIfPresentSync(file) ?? '');
+        const settings = fileWasEditedLast(file, rows) ? settingsFromSiteJson(existing) : stored;
+        writeFileAtomicallySync(file, siteJsonText(settings, existing));
+    }
+    // Dropped whether or not it had rows: a fresh database gets the table from
+    // migration 3, which has shipped and so is never edited, and a site that has
+    // been migrated must not be asked again on the next boot.
+    dropLegacyTable(db, 'settings');
+}
+/**
+ * Turn an older site's `actor_keys` rows into files under `data/keys`, once,
+ * and drop the table.
+ *
+ * The rows this writes out are the site actor's, which no version after
+ * TASK-68 has: decision-14 replaced it with one actor per user, and a user's
+ * keys are named after their username rather than after the sentinel `actor`.
+ * The files are still written rather than dropped on the floor, because a
+ * private key is the one thing this CMS never deletes for somebody — an
+ * operator who wants the old identity back has it on disk to move.
+ *
+ * This is the migration decision-9 calls the one that must not fail. Settings
+ * a site could type again and followers a site could ask for again; an actor's
+ * private key is the site's identity, and losing it means every follower's
+ * cached public key stops verifying its posts for good. So the rows are
+ * written out before the table goes, never after, and a file that is already
+ * there always wins — a site that has booted this version once has the truth
+ * on disk, and a row left over from before it did must not overwrite it.
+ *
+ * Synchronous because `createCms` is: it runs before the server is listening
+ * and before anything has asked for a key.
+ */
+export function migrateActorKeysToFiles(db, dataDir) {
+    const rows = legacyActorKeys(db);
+    if (rows !== undefined && rows.length > 0) {
+        ensureKeysDir(dataDir);
+        for (const row of rows) {
+            const file = actorKeyFile(dataDir, row.identifier, row.algorithm);
+            // Only the private half is written: the public one is derived from it,
+            // and a stored pair whose halves disagreed would be worse than none. The
+            // row is written out as it stands, byte for byte apart from the trailing
+            // newline every file here ends with — a key is not something to
+            // re-encode on the way past.
+            if (readFileIfPresentSync(file) === undefined) {
+                writeFileAtomicallySync(file, `${row.privateJwk.trimEnd()}\n`, { mode: KEY_FILE_MODE });
+            }
+        }
+    }
+    // Dropped whether or not it had rows: a fresh database gets the table from
+    // migration 4, which has shipped and so is never edited, and a site that has
+    // been migrated must not be asked again on the next boot.
+    dropLegacyTable(db, 'actor_keys');
+}
+/**
+ * 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(db, dataDir) {
+    const rows = legacyUsers(db);
+    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,
+        });
+    }
+    dropLegacyTable(db, 'users');
+}
+/** The old key/value rows as settings, defaults filled in. */
+function settingsFromRows(rows) {
+    const stored = {};
+    for (const row of rows)
+        stored[row.key] = row.value;
+    // Through the file's own reader, so one description of what a setting is
+    // worth serves both: the rows are spelled as the file spells them and read
+    // back the same way. `relays`, `navigation` and `taxonomyRedirects` were
+    // stored one entry per line, which is not how the file holds them.
+    return settingsFromSiteJson({
+        ...stored,
+        ...(stored['baseUrl'] === undefined ? {} : { url: stored['baseUrl'] }),
+        ...(stored['postsPerPage'] === undefined
+            ? {}
+            : { postsPerPage: Number(stored['postsPerPage']) }),
+        relays: relayList(stored['relays'] ?? ''),
+        menus: { [DEFAULT_MENU_NAME]: menuItemsFromText(stored['navigation'] ?? '') },
+        taxonomyRedirects: redirectList(stored['taxonomyRedirects'] ?? ''),
+    });
+}
+/**
+ * Whether `site.json` has been written since the newest settings row was.
+ *
+ * A missing file has not, so the rows win. A file whose modification time
+ * cannot be read is treated the same way: the rows are the only thing that is
+ * certainly there.
+ */
+function fileWasEditedLast(file, rows) {
+    let modified;
+    try {
+        modified = statSync(file).mtimeMs;
+    }
+    catch {
+        return false;
+    }
+    const newest = rows.reduce((latest, row) => {
+        const at = Date.parse(row.updatedAt);
+        return Number.isNaN(at) ? latest : Math.max(latest, at);
+    }, 0);
+    return modified > newest;
+}
+/**
+ * A `taxonomy|from|to` block as the renames it names, which is how the old
+ * settings table spelled them ({@link migrateSettingsToFile}).
+ *
+ * The same tolerance the rest of this file reads its lists with: a line that
+ * is not three non-empty parts naming a real taxonomy is dropped rather than
+ * failing the read.
+ */
+function redirectList(value) {
+    const entries = [];
+    for (const line of value.split('\n')) {
+        const parts = line.split('|');
+        if (parts.length !== 3)
+            continue;
+        entries.push({
+            taxonomy: (parts[0] ?? '').trim(),
+            from: (parts[1] ?? '').trim(),
+            to: (parts[2] ?? '').trim(),
+        });
+    }
+    // Through the same reader `site.json` goes through, so the two spellings of
+    // the list cannot mean different things.
+    return taxonomyRedirectsOf(entries);
+}
+//# sourceMappingURL=legacy-migrations.js.map

package/dist/admin/legacy-migrations.js.map

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

package/dist/admin/media.d.ts

@@ -1,19 +1,11 @@
 /**
  * The media screen: what is under `content/uploads/`, what links to it, and
  * the two things that can be done to it — add one, and take one away.
- *
- * The listing is a walk of the directory rather than a query, because the
- * directory is the truth (decision-1, decision-9). Nothing records that a file
- * exists; a file dropped in by hand over ssh, by a git pull, or by an Eleventy
- * build is on the screen the next time it is asked for, and a file taken away
- * the same way is off it. The only thing the index is asked is which documents
- * mention a URL, which is a question a directory cannot answer.
  */
 import type { Hono } from 'hono';
-import type { UploadKind } from '../content/media.ts';
-import type { ContentStore } from '../content/store.ts';
-import type { GeekityEnv } from '../env.ts';
-import type { AltText } from '../images/alt-text.ts';
+import type { CatalogReader } from '../content/store.ts';
+import type { GeekityEnv } from '../web/env.ts';
+import type { RemoveDerived } from '../media/library.ts';
 import type { AdminRender } from './documents.ts';
 /** Where the media screen lives. */
 export declare const MEDIA_PATH = "/admin/media";
@@ -42,50 +34,6 @@ export declare const MEDIA_FIELDS: {
     /** The library page an alt-text form was on, so saving it goes back there. */
     readonly page: 'page';
 };
-/** One file under `content/uploads/`, as the screen shows it. */
-export interface MediaFile {
-    /**
-     * Where it is under `content/uploads/`, with `/` separators — `2026/09/a.png`.
-     * This is the file's identity: it is what the delete form carries, and what
-     * a variant directory would mirror.
-     */
-    path: string;
-    /** The public URL the site serves it at. */
-    url: string;
-    /** The last segment of {@link MediaFile.path}. */
-    name: string;
-    /** Its extension, lower case, with the dot. Empty when it has none. */
-    extension: string;
-    /** How big it is, in bytes. */
-    bytes: number;
-    /** When it last changed, as an ISO 8601 instant, which is what sorts the list. */
-    modified: string;
-    /**
-     * What it is for, from its extension: an image row shows a thumbnail and an
-     * alt-text field, and an audio or video file can be a post's enclosure.
-     * Unset for a file whose extension the CMS does not know.
-     */
-    kind: UploadKind | undefined;
-    /** What the library says an image is, from `content/_data/media.json`. Unset when nothing has been said. */
-    alt: AltText | undefined;
-    /** The Markdown for it: an embed with its alt text for an image, a link for anything else. */
-    markdown: string;
-}
-/**
- * Every file under `content/uploads/`, newest first.
- *
- * Recursive, because uploads land under `{yyyy}/{mm}/`, and a site that has
- * been copying files in by hand may have any shape at all under there. The
- * order is by modification time rather than by the dated path: the path is
- * only a hint about when a file arrived, and a file dropped in by hand may
- * have no dated path to read.
- *
- * A directory that does not exist yet is an empty library rather than an
- * error — a site that has never uploaded anything has no `uploads/`.
- */
-export declare function listUploads(contentDir: string): Promise<MediaFile[]>;
-/** One upload as the screen shows it, from what a directory walk knows. */
-export declare function describeUpload(relative: string, bytes: number, modified: Date, alt?: AltText): MediaFile;
 /** One document that mentions an upload, as the confirmation names it. */
 export interface MediaReference {
     /** Path relative to the content directory: what identifies the document. */
@@ -111,59 +59,7 @@ export interface MediaReference {
  * warning rather than a decision, and the confirmation step is what makes an
  * out-of-date answer harmless in both directions.
  */
-export declare function referencesTo(store: ContentStore, url: string): MediaReference[];
-/**
- * Whether a body points at an upload URL.
- *
- * A substring search with one guard on the end of it: `/uploads/a.png` must not
- * count as a mention of `/uploads/a.pn`, and `/uploads/logo.png` must not count
- * as a mention of `/uploads/logo`. Anything that could still be part of the
- * same filename disqualifies the match; a quote, a bracket, a space or the end
- * of the body ends it.
- *
- * Deliberately blind to whether the mention is Markdown, HTML or prose. All
- * three break when the file goes, and a warning that only understood
- * `![](…)` would be a warning that missed most of them.
- */
-export declare function mentionsUpload(body: string, url: string): boolean;
-/** What {@link deleteUpload} needs to take a file away. */
-export interface DeleteUploadOptions {
-    /** The site's content directory. */
-    contentDir: string;
-    /** The file, as a path under `content/uploads/` with `/` separators. */
-    path: string;
-    /**
-     * Take the file's derived files with it.
-     *
-     * The original under `content/uploads/` is the only source of truth
-     * (decision-10); the image variants beside it are derived, and derived state
-     * that outlives what it was derived from is rubbish nobody will ever clean
-     * up. The hook is passed the same content-relative path, is awaited before
-     * the delete reports success, and is expected to be forgiving: a file with
-     * no variants at all is the normal case.
-     */
-    removeDerived?: RemoveDerived | undefined;
-}
-/** Takes an upload's derived files away with it. See {@link DeleteUploadOptions.removeDerived}. */
-export type RemoveDerived = (uploadPath: string) => Promise<void>;
-/**
- * Delete one upload, and whatever was derived from it.
- *
- * Returns `false` when there was no such file, which is what a second click on
- * a Delete button on a stale page is, rather than throwing: the end state the
- * admin asked for is the end state they have.
- */
-export declare function deleteUpload(options: DeleteUploadOptions): Promise<boolean>;
-/**
- * A submitted path as an absolute file under `content/uploads/`, or
- * `undefined` when it is not one.
- *
- * The path arrives in a form, so it is an attacker's string as much as an
- * admin's. Containment is checked after resolution rather than by inspecting
- * the string, so `..`, an encoded one, or an absolute path cannot slip past —
- * the same rule {@link findAsset} applies to a request for a file.
- */
-export declare function resolveUpload(contentDir: string, relative: string): string | undefined;
+export declare function referencesTo(store: CatalogReader, url: string): MediaReference[];
 /** What {@link mountMediaScreen} needs from the admin around it. */
 export interface MountMediaScreenOptions {
     /** The admin's renderer, which injects the chrome, the CSRF token and the flash. */

package/dist/admin/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/admin/media.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAG1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAIrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAOlD,oCAAoC;AACpC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,0DAA0D;AAC1D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,4CAA4C;AAC5C,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,cAAc,qBAAsB,CAAC;AAElD,oDAAoD;AACpD,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,uDAAuD;AACvD,eAAO,MAAM,YAAY;IACvB,gDAAgD;aAChD,IAAI,EAAE,MAAM;IACZ,oEAAoE;aACpE,IAAI,EAAE,MAAM;IACZ,wEAAwE;aACxE,OAAO,EAAE,SAAS;IAClB,2BAA2B;aAC3B,GAAG,EAAE,KAAK;IACV,yEAAyE;aACzE,UAAU,EAAE,YAAY;IACxB,8EAA8E;aAC9E,IAAI,EAAE,MAAM;CACJ,CAAC;AAEX,iEAAiE;AACjE,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,4GAA4G;IAC5G,GAAG,EAAE,OAAO,GAAG,SAAS,CAAC;IACzB,8FAA8F;IAC9F,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CA0C1E;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,IAAI,EACd,GAAG,CAAC,EAAE,OAAO,GACZ,SAAS,CA0BX;AAED,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CAY/E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAMjE;AAKD,2DAA2D;AAC3D,MAAM,WAAW,mBAAmB;IAClC,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED,mGAAmG;AACnG,MAAM,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBjF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOtF;AAED,oEAAoE;AACpE,MAAM,WAAW,uBAAuB;IACtC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;IACpB,2FAA2F;IAC3F,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAsH9F;AAkBD,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/admin/media.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAKlD,oCAAoC;AACpC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,0DAA0D;AAC1D,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC,4CAA4C;AAC5C,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,iBAAiB,wBAAyB,CAAC;AAExD,yCAAyC;AACzC,eAAO,MAAM,cAAc,qBAAsB,CAAC;AAElD,oDAAoD;AACpD,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,uDAAuD;AACvD,eAAO,MAAM,YAAY;IACvB,gDAAgD;aAChD,IAAI,EAAE,MAAM;IACZ,oEAAoE;aACpE,IAAI,EAAE,MAAM;IACZ,wEAAwE;aACxE,OAAO,EAAE,SAAS;IAClB,2BAA2B;aAC3B,GAAG,EAAE,KAAK;IACV,yEAAyE;aACzE,UAAU,EAAE,YAAY;IACxB,8EAA8E;aAC9E,IAAI,EAAE,MAAM;CACJ,CAAC;AAEX,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CAYhF;AAED,oEAAoE;AACpE,MAAM,WAAW,uBAAuB;IACtC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;IACpB,2FAA2F;IAC3F,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI,CAsH9F;AASD,4EAA4E;AAC5E,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD"}