@geekity/cms 0.3.0 → 0.4.0

package/dist/web/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/web/render.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,KAAK,EAAmB,QAAQ,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,+EAA+E;AAC/E,eAAO,MAAM,SAAS;aACpB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,kBAAkB;aACxB,IAAI,EAAE,kBAAkB;aACxB,GAAG,EAAE,iBAAiB;aACtB,QAAQ,EAAE,iBAAiB;CACnB,CAAC;AAEX,+CAA+C;AAC/C,MAAM,WAAW,OAAO;IACtB,4DAA4D;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,4CAA4C;IAC5C,UAAU,EAAE,UAAU,CAAC;IACvB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,sEAAsE;IACtE,IAAI,IAAI,QAAQ,CAAC;IACjB,kEAAkE;IAClE,QAAQ,IAAI,MAAM,CAAC;IACnB,8CAA8C;IAC9C,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC3C,gDAAgD;IAChD,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;IACxC,yDAAyD;IACzD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,uEAAuE;IACvE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACpE,8EAA8E;IAC9E,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED,uCAAuC;AACvC,MAAM,WAAW,qBAAqB;IACpC,sFAAsF;IACtF,MAAM,EAAE,cAAc,CAAC;IACvB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CAC3C;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,QAAQ,CA8DvE"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/web/render.ts"],"names":[],"mappings":"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"}

package/dist/web/render.js

@@ -1,14 +1,45 @@
-import { createSiteDataSource, documentContext, postsPerPage } from './context.js';
+import { siteIcons } from '../images/icons.js';
+import { archiveMonths, archiveOpen } from './archive.js';
+import { authorContext, siteAuthorContext } from './authors.js';
+import { createSiteDataSource, documentContext, frontPageSlugs, postsPerPage, siteTimezone, taxonomyBases, termRedirects, themeName, } from './context.js';
 import { activityStreamsId } from './documents.js';
-import { createTemplateEnvironment } from './templates.js';
+import { commentsFeedPath } from './feeds.js';
+import { navigationMenu } from './navigation.js';
+import { snippetHtml } from './search.js';
+import { createTemplateEnvironment, useThemeDirs } from './templates.js';
+import { createThemeSource, findThemeFile } from './themes.js';
+import { webmentionEndpointFor } from '../webmention/routes.js';
 /** Templates the default theme ships and the public routes ask for by name. */
 export const TEMPLATES = {
     home: 'layouts/home.njk',
     post: 'layouts/post.njk',
     page: 'layouts/page.njk',
     tag: 'layouts/tag.njk',
+    category: 'layouts/category.njk',
+    author: 'layouts/author.njk',
+    search: 'layouts/search.njk',
     notFound: 'layouts/404.njk',
 };
+/**
+ * The two templates named for the Reading choice, which a theme may write and
+ * which fall back to an ordinary layout when it has not.
+ *
+ * They are WordPress's own `front-page.php` and `home.php`, and they exist for
+ * the same reason: a front page is often the one page of a site that looks
+ * like nothing else, and saying so should not mean overriding the layout every
+ * other page uses. The default theme ships `front-page.njk` (TASK-85) and no
+ * posts page layout, so a site that sets a posts page gets the listing layout
+ * until it writes one.
+ */
+export const OPTIONAL_TEMPLATES = {
+    /**
+     * The front page alone. The default theme ships one (TASK-85), so the
+     * fallback is only reached by a theme that replaced it with nothing.
+     */
+    frontPage: 'layouts/front-page.njk',
+    /** The listing on the posts page. Falls back to {@link TEMPLATES.home}. */
+    postsPage: 'layouts/posts-page.njk',
+};
 /**
  * Build the renderer for one site.
  *
@@ -18,46 +49,290 @@ export const TEMPLATES = {
  */
 export function createRenderer(options) {
     const { config } = options;
+    const siteData = createSiteDataSource(config);
+    // Which theme every render below reads from. Built here when the caller did
+    // not bring one so that a renderer made on its own — a test over one
+    // template, a site rendering a fragment of its own — still follows the
+    // `theme` in `site.json`; `createCms` hands in the one the mail templates
+    // and the `/theme/` assets share, so a site has a single answer and logs a
+    // bad choice once.
+    const themes = options.themes ??
+        createThemeSource({ themesDir: config.themesDir, chosen: () => themeName(siteData.read()) });
     const environment = createTemplateEnvironment({
-        themeDir: config.themeDir,
+        themeDirs: themes.current().dirs,
         baseUrl: config.baseUrl,
         noCache: config.watch,
     });
-    const siteData = createSiteDataSource(config, { settings: options.settings });
+    const pages = options.pages ?? (() => []);
+    const users = options.users ?? (() => []);
     function render(template, context = {}) {
         const site = siteData.read();
-        return environment.render(template, { site, ...context });
+        // Before anything is looked up: a theme chosen on the Appearance screen, or
+        // written into `site.json` by hand, decides this very render rather than
+        // the next boot. It costs a comparison of two short arrays when nothing
+        // has changed, which is every render of a site that is not being rethemed.
+        useThemeDirs(environment, themes.current().dirs);
+        // The menu is built here rather than by each caller because every page of
+        // the site carries it: a listing, a document, the 404 and the editor's
+        // preview all go through here, and a header that appeared on some of them
+        // and not others would be a worse contract than one that is simply always
+        // there. It is `menu` rather than `navigation` because `navigation` is the
+        // front-matter key a page opts in with, and a document's own front matter
+        // goes on top of the globals exactly as Eleventy's data cascade does.
+        const menu = navigationMenu({ site, pages: pages(), url: currentUrl(context) });
+        // Who the page is by, for the bio, the `rel="me"` links and the structured
+        // data (decision-16). It is here rather than in each caller because every
+        // page of the site carries it, for the reason the menu does — and it is
+        // the site's own author only when the page is about nobody in particular:
+        // a document's byline and an author archive's person are put on the
+        // context by the callers below, and win by going on last.
+        const owner = context['siteAuthor'] === undefined ? siteAuthorContext(users(), site.author) : undefined;
+        // The site's icons, as the three links a head carries (TASK-81). They are
+        // computed here rather than in the layout because only this side knows
+        // where a derived file is served and whether the site can derive one at
+        // all: a theme that was handed the avatar path would have to build the URL
+        // itself and would link three 404s on a site with image optimization off.
+        const icons = siteIcons(config, site.avatar);
+        return environment.render(template, {
+            site,
+            menu,
+            icons,
+            ...(owner === undefined ? {} : { siteAuthor: owner }),
+            ...context,
+        });
+    }
+    /**
+     * The front page's recent posts, as the entries a listing prints, or nothing
+     * at all when the renderer was built without a source for them.
+     *
+     * One read of the users file for the whole list, the way a listing does it:
+     * five posts is five bylines resolved against the same people.
+     */
+    function recentPostsContext() {
+        const posts = options.recentPosts?.();
+        if (posts === undefined)
+            return {};
+        const people = users();
+        return {
+            recentPosts: posts.map((document) => documentContext(document, config, authorContext(people, document.author))),
+        };
+    }
+    /**
+     * The whole archive as the months an archive page heads, or nothing at all
+     * for every other document.
+     *
+     * The front matter key decides, so the list is on the context of exactly the
+     * page that asked for it and a layout writes `{% if archiveMonths %}` rather
+     * than reading front matter for itself — the way `contactForm` works.
+     */
+    function archiveContext(document) {
+        if (!archiveOpen(document))
+            return {};
+        const posts = options.archivePosts?.();
+        if (posts === undefined)
+            return {};
+        return { archiveMonths: archiveMonths(posts, siteTimezone(siteData.read())) };
+    }
+    /**
+     * The page whose own URL carries the listing, as the link a front page draws
+     * to it, or nothing at all when the site names none.
+     *
+     * Resolved here rather than by the route because the renderer already holds
+     * both halves — the setting and the published pages — and because the link
+     * is the front page's alone: everywhere else the posts page is an ordinary
+     * item of the site menu.
+     */
+    function postsPageContext() {
+        const slug = frontPageSlugs(siteData.read()).postsPage;
+        if (slug === '')
+            return {};
+        const found = pages().find((document) => document.slug === slug);
+        return found === undefined ? {} : { postsPage: { title: found.title, url: found.permalink } };
+    }
+    /**
+     * Which template one listing renders through: whatever it named, the posts
+     * page's own template when it is one and the theme ships one, and the home
+     * layout otherwise.
+     */
+    function listingTemplate(listing) {
+        if (listing.template !== undefined)
+            return listing.template;
+        if (listing.document === undefined)
+            return TEMPLATES.home;
+        return themeTemplate(themes.current().dirs, OPTIONAL_TEMPLATES.postsPage, TEMPLATES.home);
+    }
+    /**
+     * One document through one template, with everything a page of the theme is
+     * given: its own context, its ActivityStreams id, its conversation, its
+     * forms and its webmention endpoint.
+     *
+     * The template and the URL are arguments because the front page is the same
+     * page rendered somewhere else: `renderDocument` and `renderFrontPage` are
+     * this with two different answers to "which layout, and at which URL".
+     */
+    function documentPage(document, options_) {
+        const { template, extra } = options_;
+        // The profile behind the document's `author`, resolved here rather than in
+        // `documentContext` for the reason the object id is: it needs the site's
+        // users, which a document on its own does not carry.
+        const writer = authorContext(users(), document.author);
+        const context = documentContext(document, config, writer);
+        // The URL it is being served at, which is its own permalink everywhere but
+        // the front page.
+        const url = options_.url ?? context.url;
+        // `activityStreams` is the object id the base layout advertises. It is
+        // added here rather than in `documentContext` because it needs the
+        // site's base URL, which a document on its own does not carry.
+        const objectId = activityStreamsId(document, config.baseUrl);
+        // `commentsFeed` is where this post's replies are syndicated. It is set
+        // here rather than in a layout because only a published post has one —
+        // a page never federates, so nothing can ever have replied to it — and
+        // because a site that overrides `post.njk` should keep the link anyway.
+        // `conversation` is what the fediverse said back. It is on the context
+        // only when there is something in it, so a theme can ask `{% if
+        // conversation %}` and a post nobody has answered renders no empty
+        // section (TASK-49).
+        const said = options.conversation?.(document);
+        // `commentForm` is on the context only when the post is open, so the
+        // theme asks `{% if commentForm %}` rather than working the rules out
+        // for itself — and a closed post shows the thread with no form.
+        const form = options.commentForm?.(document);
+        // And the contact form, when the page's front matter asked for one
+        // (TASK-56). Nothing about where a message would go is on the context:
+        // the address is read when a submission arrives, so a theme cannot
+        // print it however it is written.
+        const contact = options.contactForm?.(document);
+        // Where a webmention about this page is sent (TASK-51). On the context
+        // only when the site takes them, so a theme asks `{% if webmention %}`
+        // and a site that has turned them off advertises nothing.
+        const webmention = webmentionEndpointFor(siteData.read());
+        // The posts either side of this one, as the two links a theme draws under
+        // an entry (TASK-79). Each is on the context only when there is one, so a
+        // theme asks `{% if previous %}` and the ends of the archive draw nothing.
+        const either = options.neighbours?.(document) ?? {};
+        return render(template, {
+            ...context,
+            // This page's own person, which is the site's author everywhere else:
+            // the byline and the identity a theme prints are one object, so what a
+            // reader sees and what the structured data says cannot drift.
+            ...(writer === undefined ? {} : { siteAuthor: writer }),
+            ...neighbourContext('previous', either.previous),
+            ...neighbourContext('next', either.next),
+            url,
+            page: { ...context.page, url },
+            ...(objectId === undefined
+                ? {}
+                : {
+                    activityStreams: objectId,
+                    commentsFeed: commentsFeedPath(document.permalink),
+                }),
+            // And the whole archive, for a page whose front matter asked for it
+            // (TASK-85). On the context only for that page, so a theme asks
+            // `{% if archiveMonths %}` exactly as it asks about the contact form.
+            ...archiveContext(document),
+            ...(said === undefined || said.counts.total === 0 ? {} : { conversation: said }),
+            ...(form === undefined ? {} : { commentForm: form }),
+            ...(contact === undefined ? {} : { contactForm: contact }),
+            ...(webmention === undefined ? {} : { webmention }),
+            ...extra,
+        });
     }
     return {
         environment,
         site() {
             return siteData.read();
         },
+        themeDirs() {
+            return themes.current().dirs;
+        },
         pageSize() {
             return postsPerPage(siteData.read());
         },
-        renderDocument(document) {
-            const template = document.type === 'post' ? TEMPLATES.post : TEMPLATES.page;
-            // `activityStreams` is the object id the base layout advertises. It is
-            // added here rather than in `documentContext` because it needs the
-            // site's base URL, which a document on its own does not carry.
-            const objectId = activityStreamsId(document, config.baseUrl);
-            return render(template, {
-                ...documentContext(document),
-                ...(objectId === undefined ? {} : { activityStreams: objectId }),
+        taxonomyBases() {
+            return taxonomyBases(siteData.read());
+        },
+        termRedirects() {
+            return termRedirects(siteData.read());
+        },
+        frontPageSlugs() {
+            return frontPageSlugs(siteData.read());
+        },
+        renderDocument(document, extra = {}) {
+            return documentPage(document, {
+                template: document.type === 'post' ? TEMPLATES.post : TEMPLATES.page,
+                extra,
+            });
+        },
+        renderFrontPage(document, extra = {}) {
+            return documentPage(document, {
+                // A theme's own front page if it has written one, and the layout every
+                // other page uses if it has not.
+                template: themeTemplate(themes.current().dirs, OPTIONAL_TEMPLATES.frontPage, TEMPLATES.page),
+                // At `/`, which is where it is being read: the canonical link, the
+                // menu's current item and anything else a theme takes off `page.url`
+                // should say the URL this is served at rather than the one that
+                // redirects here.
+                url: '/',
+                // The newest posts under the page's own words, which is what a front
+                // page is for (decision-16). Built here rather than by the route
+                // because it is the same document context every listing entry is, and
+                // resolved once for the whole list the way a listing's bylines are.
+                // `postsPage` goes with them: the front page is the one page that
+                // links the listing by name rather than by menu item.
+                extra: { ...recentPostsContext(), ...postsPageContext(), ...extra },
             });
         },
         renderListing(listing) {
-            const items = listing.documents.map(documentContext);
-            return render(listing.template ?? TEMPLATES.home, {
+            // One read of the users file for the whole page, however many posts are
+            // on it: every byline on a listing resolves against the same list.
+            const people = users();
+            const items = listing.documents.map((document) => documentContext(document, config, authorContext(people, document.author)));
+            // The posts page's own front matter and rendered body, under the
+            // listing's title, URL and posts: a theme prints `{{ content | safe }}`
+            // above the list and a site without a posts page has nothing there. The
+            // listing's own keys go on after it, because this page of the listing is
+            // what is being served — page two of it is not the page's own URL.
+            const document = listing.document === undefined
+                ? undefined
+                : documentContext(listing.document, config, authorContext(people, listing.document.author));
+            return render(listingTemplate(listing), {
+                ...document,
                 title: listing.title,
                 url: listing.url,
-                page: { url: listing.url },
+                page: { ...document?.page, url: listing.url },
                 // `posts` is the friendly name a theme loops over; `pagination.items`
                 // is the same array under the name Eleventy gives it.
                 posts: items,
                 pagination: { ...listing.pagination, items },
                 ...(listing.tag === undefined ? {} : { tag: listing.tag }),
+                ...(listing.category === undefined ? {} : { category: listing.category }),
+                // On an author archive this is the person the archive is of, and it
+                // goes on last so it wins over the posts page's own `author`, which is
+                // the page's writer rather than whose archive this is. They are also
+                // whose page this is, so the identity a theme prints is theirs rather
+                // than the site's.
+                ...(listing.author === undefined
+                    ? {}
+                    : { author: listing.author, siteAuthor: listing.author }),
+            });
+        },
+        renderSearch(search) {
+            const people = users();
+            const items = search.hits.map((hit) => ({
+                ...documentContext(hit.document, config, authorContext(people, hit.document.author)),
+                // Escaped here and marked up here, so a theme prints it with `safe`
+                // and cannot get the order of the two wrong.
+                snippet: snippetHtml(hit.snippet),
+            }));
+            return render(TEMPLATES.search, {
+                title: search.query === '' ? 'Search' : `Search results for “${search.query}”`,
+                url: search.url,
+                page: { url: search.url },
+                // The words as the reader typed them, for the form to put back in the
+                // box and the heading to repeat. Autoescaped like any other string.
+                query: search.query,
+                posts: items,
+                pagination: { ...search.pagination, items },
             });
         },
         renderNotFound(url) {
@@ -70,4 +345,46 @@ export function createRenderer(options) {
         render,
     };
 }
+/**
+ * One neighbour under the name a theme reads it by, or nothing at all when
+ * there is no post on that side.
+ *
+ * The title and the URL and no more: a link is what it says and where it goes,
+ * and handing a theme a second document context would be handing it a second
+ * post to print by accident.
+ */
+function neighbourContext(key, document) {
+    if (document === undefined)
+        return {};
+    return { [key]: { title: document.title, url: document.permalink } };
+}
+/**
+ * `preferred` when a theme in the search path ships it, and `fallback`
+ * otherwise.
+ *
+ * Asked per render rather than at boot, so adding `front-page.njk` to a theme
+ * shows on the next request exactly as editing one does. It costs one `stat`
+ * per theme directory, and only on the two pages that have an override point
+ * at all.
+ */
+function themeTemplate(themeDirs, preferred, fallback) {
+    return findThemeFile(themeDirs, preferred) === undefined ? fallback : preferred;
+}
+/**
+ * The path a render is of, for marking the current menu item.
+ *
+ * Read off `page.url` and then `url`, the two names every caller here already
+ * sets, so nothing has to pass the path a third time. A template rendered with
+ * neither — a site calling `render` for a fragment of its own — is treated as
+ * the home page's, which marks nothing that a page of the site would not.
+ */
+function currentUrl(context) {
+    const page = context['page'];
+    if (typeof page === 'object' && page !== null) {
+        const url = page['url'];
+        if (typeof url === 'string')
+            return url;
+    }
+    return typeof context['url'] === 'string' ? context['url'] : '/';
+}
 //# sourceMappingURL=render.js.map

package/dist/web/render.js.map

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

package/dist/web/routes.d.ts

@@ -1,10 +1,8 @@
 import type { Context, Hono } from 'hono';
+import type { Document } from '../content/document.ts';
 import type { GeekityEnv } from '../env.ts';
 import type { FeedFormat } from './feeds.ts';
-/** Where a paginated listing's later pages live, under any listing root. */
-export declare const PAGE_SEGMENT = "page";
-/** Root of the tag archives. */
-export declare const TAG_SEGMENT = "tags";
+import type { TaxonomyBases, TaxonomyTerm } from './taxonomy.ts';
 /**
  * Register the public site on a Hono app.
  *
@@ -16,10 +14,29 @@ export declare const TAG_SEGMENT = "tags";
 export declare function mountPublicSite(app: Hono<GeekityEnv>): void;
 /** The URL of a page of the home listing, by zero-based index. */
 export declare function homeHref(index: number): string;
-/** The URL of a page of a tag archive, by zero-based index. */
-export declare function tagHref(tag: string, index: number): string;
-/** The URL of a feed: the whole archive's, or one tag's. */
-export declare function feedHref(tag: string | undefined, format: FeedFormat): string;
+/**
+ * The URL of a page of the listing that hangs off `root`, by zero-based index.
+ *
+ * The first page is the root itself: `/` or the posts page's own permalink,
+ * which is what makes a posts page one URL rather than two.
+ */
+export declare function listingPageHref(root: string, index: number): string;
+/**
+ * The URL of a feed: the whole site's, or one taxonomy archive's.
+ *
+ * WordPress's layout, so a subscriber of a migrated site keeps polling the URL
+ * they already hold: `/feed/` is RSS 2.0, `/feed/atom/` and `/feed/json/` are
+ * its siblings, and an archive's feeds hang off the archive.
+ */
+export declare function feedHref(term: TaxonomyTerm | undefined, format: FeedFormat, bases: TaxonomyBases): string;
+/**
+ * Where the site's comments feed lives, and where one post's does.
+ *
+ * WordPress's URLs, so a site migrated from it keeps both: the whole site's
+ * comments at `/comments/feed/`, and a post's under its own permalink. There
+ * is one format, RSS 2.0, because that is what a comments feed is read in.
+ */
+export declare function commentsFeedHref(document: Document | undefined): string;
 /** The theme's 404 page. */
 export declare function notFound(c: Context<GeekityEnv>): Response;
 /**

package/dist/web/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/web/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAgB5C,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,YAAY,CAAC;AAkBzD,4EAA4E;AAC5E,eAAO,MAAM,YAAY,SAAS,CAAC;AAEnC,gCAAgC;AAChC,eAAO,MAAM,WAAW,SAAS,CAAC;AAElC;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAiC3D;AAqVD,kEAAkE;AAClE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,+DAA+D;AAC/D,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG1D;AAED,4DAA4D;AAC5D,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAE5E;AAED,4BAA4B;AAC5B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,QAAQ,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAO1D"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/web/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAK1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AA0C5C,OAAO,KAAK,EAAkC,UAAU,EAAc,MAAM,YAAY,CAAC;AAqCzF,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEjE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAyF3D;AAyoCD,kEAAkE;AAClE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE;AA6BD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,YAAY,GAAG,SAAS,EAC9B,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,aAAa,GACnB,MAAM,CAER;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,CAEvE;AAED,4BAA4B;AAC5B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,QAAQ,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAO1D"}