erudit 4.0.0-dev.4 → 4.0.0

package/server/api/main/content/[...contentTypePath].ts

@@ -1,153 +1,149 @@
-import { and, eq } from 'drizzle-orm';
-
-export default defineEventHandler<Promise<MainContent>>(async (event) => {
-    const strContentTypePath = event.context.params?.contentTypePath;
-    const contentTypePath = parseContentTypePath(strContentTypePath!);
-    const navNode = ERUDIT.contentNav.getNodeOrThrow(contentTypePath.contentId);
-    const fullId = navNode.fullId;
-    const shortId = navNode.shortId;
-    const contentRelativePath = navNode.contentRelPath;
-    const title = await ERUDIT.repository.content.title(fullId);
-    const description = await ERUDIT.repository.content.description(fullId);
-    const decoration = await ERUDIT.repository.content.decoration(fullId);
-    const elementSnippets =
-        await ERUDIT.repository.content.elementSnippets(fullId);
-    const flags = await ERUDIT.repository.content.flags(fullId);
-    const stats = await ERUDIT.repository.content.stats(fullId);
-    const connections = await ERUDIT.repository.content.connections(fullId);
-    const contributions = await ERUDIT.repository.content.contentContributions(
-        fullId,
-        ['topic', 'page'].includes(contentTypePath.type),
-    );
-    const seo = await ERUDIT.repository.content.seo(fullId);
-
-    const bookNode = ERUDIT.contentNav.getBookFor(fullId);
-    const bookTitle = bookNode
-        ? await ERUDIT.repository.content.title(bookNode.fullId)
-        : undefined;
-
-    //
-    // Base
-    //
-    const mainContentBase: Omit<MainContentBase, 'type'> = {
-        fullId,
-        shortId,
-        contentRelativePath,
-        title,
-        bookTitle,
-        breadcrumbs: await ERUDIT.repository.content.breadcrumbs(fullId),
-        seo,
-    };
-
-    if (description) {
-        mainContentBase.description = description;
-    }
-
-    if (decoration) {
-        mainContentBase.decoration = decoration;
-    }
-
-    if (flags) {
-        mainContentBase.flags = flags;
-    }
-
-    if (stats) {
-        mainContentBase.stats = stats;
-    }
-
-    if (connections) {
-        mainContentBase.connections = connections;
-    }
-
-    if (contributions) {
-        mainContentBase.contributions = contributions;
-    }
-
-    if (contentTypePath.type === 'page' || contentTypePath.type === 'topic') {
-        const proseElement = await ERUDIT.repository.prose.getContent(
-            contentTypePath.type === 'topic'
-                ? contentTypePath.topicPart
-                : contentTypePath.type,
-            fullId,
-        );
-
-        const topicParts = await ERUDIT.repository.content.topicParts(fullId);
-        const { storage } =
-            await ERUDIT.repository.prose.finalize(proseElement);
-
-        const where = (() => {
-            if (contentTypePath.type === 'topic') {
-                return and(
-                    eq(ERUDIT.db.schema.contentToc.fullId, fullId),
-                    eq(
-                        ERUDIT.db.schema.contentToc.topicPart,
-                        contentTypePath.topicPart,
-                    ),
-                );
-            }
-
-            return eq(ERUDIT.db.schema.contentToc.fullId, fullId);
-        })();
-
-        const tocItems = (
-            await ERUDIT.db.query.contentToc.findFirst({
-                columns: { toc: true },
-                where,
-            })
-        )?.toc;
-
-        //
-        // Topic
-        //
-        if (contentTypePath.type === 'topic') {
-            const mainContentTopicPart: MainContentTopicPart = {
-                ...mainContentBase,
-                type: 'topic',
-                part: contentTypePath.topicPart,
-                parts: topicParts,
-                proseElement,
-                storage,
-            };
-
-            if (elementSnippets) {
-                mainContentTopicPart.snippets = elementSnippets;
-            }
-
-            if (tocItems) {
-                mainContentTopicPart.toc = tocItems;
-            }
-
-            return mainContentTopicPart;
-        }
-
-        //
-        // Page
-        //
-
-        const mainContentPage: MainContentPage = {
-            ...mainContentBase,
-            type: 'page',
-            proseElement,
-            storage,
-        };
-
-        if (elementSnippets) {
-            mainContentPage.snippets = elementSnippets;
-        }
-
-        if (tocItems) {
-            mainContentPage.toc = tocItems;
-        }
-
-        return mainContentPage;
-    }
-
-    //
-    // Rest content types
-    //
-    return {
-        ...mainContentBase,
-        type: contentTypePath.type,
-        children: await ERUDIT.repository.content.children(fullId),
-    } satisfies MainContentGroup | MainContentBook;
-});
+import { and, eq } from 'drizzle-orm';
+
+export default defineEventHandler<Promise<MainContent>>(async (event) => {
+  const strContentTypePath = event.context.params?.contentTypePath;
+  const contentTypePath = parseContentTypePath(strContentTypePath!);
+  const navNode = ERUDIT.contentNav.getNodeOrThrow(contentTypePath.contentId);
+  const fullId = navNode.fullId;
+  const shortId = navNode.shortId;
+  const contentRelativePath = navNode.contentRelPath;
+  const title = await ERUDIT.repository.content.title(fullId);
+  const description = await ERUDIT.repository.content.description(fullId);
+  const decoration = await ERUDIT.repository.content.decoration(fullId);
+  const elementSnippets =
+    await ERUDIT.repository.content.elementSnippets(fullId);
+  const flags = await ERUDIT.repository.content.flags(fullId);
+  const stats = await ERUDIT.repository.content.stats(fullId);
+  const connections = await ERUDIT.repository.content.connections(fullId);
+  const contributions = await ERUDIT.repository.content.contentContributions(
+    fullId,
+    ['topic', 'page'].includes(contentTypePath.type),
+  );
+  const seo = await ERUDIT.repository.content.seo(fullId);
+
+  const bookNode = ERUDIT.contentNav.getBookFor(fullId);
+  const bookTitle = bookNode
+    ? await ERUDIT.repository.content.title(bookNode.fullId)
+    : undefined;
+
+  //
+  // Base
+  //
+  const mainContentBase: Omit<MainContentBase, 'type'> = {
+    fullId,
+    shortId,
+    contentRelativePath,
+    title,
+    bookTitle,
+    breadcrumbs: await ERUDIT.repository.content.breadcrumbs(fullId),
+    seo,
+  };
+
+  if (description) {
+    mainContentBase.description = description;
+  }
+
+  if (decoration) {
+    mainContentBase.decoration = decoration;
+  }
+
+  if (flags) {
+    mainContentBase.flags = flags;
+  }
+
+  if (stats) {
+    mainContentBase.stats = stats;
+  }
+
+  if (connections) {
+    mainContentBase.connections = connections;
+  }
+
+  if (contributions) {
+    mainContentBase.contributions = contributions;
+  }
+
+  if (contentTypePath.type === 'page' || contentTypePath.type === 'topic') {
+    const proseElement = await ERUDIT.repository.prose.getContent(
+      contentTypePath.type === 'topic'
+        ? contentTypePath.topicPart
+        : contentTypePath.type,
+      fullId,
+    );
+
+    const topicParts = await ERUDIT.repository.content.topicParts(fullId);
+    const { storage } = await ERUDIT.repository.prose.finalize(proseElement);
+
+    const where = (() => {
+      if (contentTypePath.type === 'topic') {
+        return and(
+          eq(ERUDIT.db.schema.contentToc.fullId, fullId),
+          eq(ERUDIT.db.schema.contentToc.topicPart, contentTypePath.topicPart),
+        );
+      }
+
+      return eq(ERUDIT.db.schema.contentToc.fullId, fullId);
+    })();
+
+    const tocItems = (
+      await ERUDIT.db.query.contentToc.findFirst({
+        columns: { toc: true },
+        where,
+      })
+    )?.toc;
+
+    //
+    // Topic
+    //
+    if (contentTypePath.type === 'topic') {
+      const mainContentTopicPart: MainContentTopicPart = {
+        ...mainContentBase,
+        type: 'topic',
+        part: contentTypePath.topicPart,
+        parts: topicParts,
+        proseElement,
+        storage,
+      };
+
+      if (elementSnippets) {
+        mainContentTopicPart.snippets = elementSnippets;
+      }
+
+      if (tocItems) {
+        mainContentTopicPart.toc = tocItems;
+      }
+
+      return mainContentTopicPart;
+    }
+
+    //
+    // Page
+    //
+
+    const mainContentPage: MainContentPage = {
+      ...mainContentBase,
+      type: 'page',
+      proseElement,
+      storage,
+    };
+
+    if (elementSnippets) {
+      mainContentPage.snippets = elementSnippets;
+    }
+
+    if (tocItems) {
+      mainContentPage.toc = tocItems;
+    }
+
+    return mainContentPage;
+  }
+
+  //
+  // Rest content types
+  //
+  return {
+    ...mainContentBase,
+    type: contentTypePath.type,
+    children: await ERUDIT.repository.content.children(fullId),
+  } satisfies MainContentGroup | MainContentBook;
+});

package/server/api/news/batch/[batchIndex].ts

@@ -1,5 +1,5 @@
-export default defineEventHandler(async (event) => {
-    const { batchIndex } = event.context.params as { batchIndex: string };
-    const batch = await ERUDIT.repository.news.batch(parseInt(batchIndex, 10));
-    return batch;
-});
+export default defineEventHandler(async (event) => {
+  const { batchIndex } = event.context.params as { batchIndex: string };
+  const batch = await ERUDIT.repository.news.batch(parseInt(batchIndex, 10));
+  return batch;
+});

package/server/api/pageSponsors.ts

@@ -1,58 +1,56 @@
-import type { PageSponsor } from '@erudit-js/core/sponsor';
-
-export default defineEventHandler<Promise<PageSponsor[]>>(async (event) => {
-    const pageSponsors: PageSponsor[] = [];
-    const dbSponsors = await ERUDIT.db.query.sponsors.findMany();
-
-    for (const dbSponsor of dbSponsors) {
-        const pageSponsor: PageSponsor = {
-            name: dbSponsor.data.name ?? dbSponsor.sponsorId,
-        };
-
-        // Try get info
-        if (dbSponsor.data.info) {
-            pageSponsor.info = dbSponsor.data.info;
-        }
-
-        // If has messages, treat random message as info
-        if (dbSponsor.data.messages?.enabled) {
-            if (dbSponsor.data.messages.list) {
-                pageSponsor.info =
-                    dbSponsor.data.messages.list[
-                        Math.floor(
-                            Math.random() * dbSponsor.data.messages.list.length,
-                        )
-                    ];
-            }
-        }
-
-        if (dbSponsor.data.link) {
-            pageSponsor.link = dbSponsor.data.link;
-        }
-
-        if (dbSponsor.data.icon) {
-            pageSponsor.icon = dbSponsor.data.icon;
-        }
-
-        if (dbSponsor.data.avatarExtension) {
-            pageSponsor.avatarUrl = ERUDIT.repository.sponsors.avatarUrl(
-                dbSponsor.sponsorId,
-                dbSponsor.data.avatarExtension,
-            );
-        }
-
-        if (dbSponsor.data.color) {
-            pageSponsor.color = dbSponsor.data.color;
-        }
-
-        if (dbSponsor.data.group) {
-            pageSponsor.group = dbSponsor.data.group;
-        }
-
-        pageSponsors.push(pageSponsor);
-    }
-
-    pageSponsors.sort((a, b) => a.name.localeCompare(b.name));
-
-    return pageSponsors;
-});
+import type { PageSponsor } from '@erudit-js/core/sponsor';
+
+export default defineEventHandler<Promise<PageSponsor[]>>(async (event) => {
+  const pageSponsors: PageSponsor[] = [];
+  const dbSponsors = await ERUDIT.db.query.sponsors.findMany();
+
+  for (const dbSponsor of dbSponsors) {
+    const pageSponsor: PageSponsor = {
+      name: dbSponsor.data.name ?? dbSponsor.sponsorId,
+    };
+
+    // Try get info
+    if (dbSponsor.data.info) {
+      pageSponsor.info = dbSponsor.data.info;
+    }
+
+    // If has messages, treat random message as info
+    if (dbSponsor.data.messages?.enabled) {
+      if (dbSponsor.data.messages.list) {
+        pageSponsor.info =
+          dbSponsor.data.messages.list[
+            Math.floor(Math.random() * dbSponsor.data.messages.list.length)
+          ];
+      }
+    }
+
+    if (dbSponsor.data.link) {
+      pageSponsor.link = dbSponsor.data.link;
+    }
+
+    if (dbSponsor.data.icon) {
+      pageSponsor.icon = dbSponsor.data.icon;
+    }
+
+    if (dbSponsor.data.avatarExtension) {
+      pageSponsor.avatarUrl = ERUDIT.repository.sponsors.avatarUrl(
+        dbSponsor.sponsorId,
+        dbSponsor.data.avatarExtension,
+      );
+    }
+
+    if (dbSponsor.data.color) {
+      pageSponsor.color = dbSponsor.data.color;
+    }
+
+    if (dbSponsor.data.group) {
+      pageSponsor.group = dbSponsor.data.group;
+    }
+
+    pageSponsors.push(pageSponsor);
+  }
+
+  pageSponsors.sort((a, b) => a.name.localeCompare(b.name));
+
+  return pageSponsors;
+});

package/server/api/prerender/content.ts

@@ -1,82 +1,79 @@
-export default defineEventHandler(async () => {
-    const routes: string[] = [];
-
-    routes.push(...(await pages()));
-    routes.push(...(await contentUniques()));
-    routes.push(...(await problemScripts()));
-
-    return routes;
-});
-
-export async function pages() {
-    const routes: string[] = [];
-
-    for (const navNode of ERUDIT.contentNav.id2Node.values()) {
-        if (navNode.type === 'topic') {
-            const topicParts = await ERUDIT.repository.content.topicParts(
-                navNode.fullId,
-            );
-
-            for (const part of topicParts) {
-                routes.push(PAGES.topic(part, navNode.shortId));
-                routes.push(
-                    `/api/preview/contentPage/${stringifyContentTypePath(part, navNode.fullId)}.json`,
-                );
-            }
-        } else {
-            routes.push(PAGES[navNode.type](navNode.shortId));
-            routes.push(
-                `/api/preview/contentPage/${stringifyContentTypePath(
-                    navNode.type,
-                    navNode.fullId,
-                )}.json`,
-            );
-        }
-    }
-    return routes;
-}
-
-export async function contentUniques() {
-    const routes: string[] = [];
-
-    const dbUniques = await ERUDIT.db.query.contentUniques.findMany({
-        columns: {
-            contentFullId: true,
-            contentProseType: true,
-            uniqueName: true,
-        },
-    });
-
-    for (const dbUnique of dbUniques) {
-        routes.push(
-            `/api/preview/contentUnique/${stringifyContentTypePath(dbUnique.contentProseType, dbUnique.contentFullId)}/${dbUnique.uniqueName}.json`,
-        );
-    }
-
-    return routes;
-}
-
-export async function problemScripts() {
-    const routes: string[] = [];
-
-    const dbProblemScripts = await ERUDIT.db
-        .selectDistinct({
-            problemScript: ERUDIT.db.schema.problemScripts.problemScriptSrc,
-        })
-        .from(ERUDIT.db.schema.problemScripts);
-
-    for (const dbProblemScript of dbProblemScripts) {
-        routes.push(
-            `/api/problemScript/` +
-                dbProblemScript
-                    .problemScript!.replace(
-                        ERUDIT.config.paths.project + '/',
-                        '',
-                    )
-                    .replace('.tsx', '') +
-                '.js',
-        );
-    }
-
-    return routes;
-}
+export default defineEventHandler(async () => {
+  const routes: string[] = [];
+
+  routes.push(...(await pages()));
+  routes.push(...(await contentUniques()));
+  routes.push(...(await problemScripts()));
+
+  return routes;
+});
+
+export async function pages() {
+  const routes: string[] = [];
+
+  for (const navNode of ERUDIT.contentNav.id2Node.values()) {
+    if (navNode.type === 'topic') {
+      const topicParts = await ERUDIT.repository.content.topicParts(
+        navNode.fullId,
+      );
+
+      for (const part of topicParts) {
+        routes.push(PAGES.topic(part, navNode.shortId));
+        routes.push(
+          `/api/preview/contentPage/${stringifyContentTypePath(part, navNode.fullId)}.json`,
+        );
+      }
+    } else {
+      routes.push(PAGES[navNode.type](navNode.shortId));
+      routes.push(
+        `/api/preview/contentPage/${stringifyContentTypePath(
+          navNode.type,
+          navNode.fullId,
+        )}.json`,
+      );
+    }
+  }
+  return routes;
+}
+
+export async function contentUniques() {
+  const routes: string[] = [];
+
+  const dbUniques = await ERUDIT.db.query.contentUniques.findMany({
+    columns: {
+      contentFullId: true,
+      contentProseType: true,
+      uniqueName: true,
+    },
+  });
+
+  for (const dbUnique of dbUniques) {
+    routes.push(
+      `/api/preview/contentUnique/${stringifyContentTypePath(dbUnique.contentProseType, dbUnique.contentFullId)}/${dbUnique.uniqueName}.json`,
+    );
+  }
+
+  return routes;
+}
+
+export async function problemScripts() {
+  const routes: string[] = [];
+
+  const dbProblemScripts = await ERUDIT.db
+    .selectDistinct({
+      problemScript: ERUDIT.db.schema.problemScripts.problemScriptSrc,
+    })
+    .from(ERUDIT.db.schema.problemScripts);
+
+  for (const dbProblemScript of dbProblemScripts) {
+    routes.push(
+      `/api/problemScript/` +
+        dbProblemScript
+          .problemScript!.replace(ERUDIT.paths.project() + '/', '')
+          .replace('.tsx', '') +
+        '.js',
+    );
+  }
+
+  return routes;
+}

package/server/api/prerender/default.ts

@@ -1,35 +1,35 @@
-export default defineEventHandler(async () => {
-    const routes: string[] = [];
-
-    //
-    // Index
-    //
-
-    routes.push(PAGES.index);
-
-    //
-    // Contributors
-    //
-
-    if (ERUDIT.config.public.project.contributors?.enabled) {
-        routes.push(PAGES.contributors);
-
-        const dbContributors = await ERUDIT.db.query.contributors.findMany({
-            columns: { contributorId: true },
-        });
-
-        for (const dbContributor of dbContributors) {
-            routes.push(PAGES.contributor(dbContributor.contributorId));
-        }
-    }
-
-    //
-    // Sponsors
-    //
-
-    if (ERUDIT.config.public.project.sponsors?.enabled) {
-        routes.push(PAGES.sponsors);
-    }
-
-    return routes;
-});
+export default defineEventHandler(async () => {
+  const routes: string[] = [];
+
+  //
+  // Index
+  //
+
+  routes.push(PAGES.index);
+
+  //
+  // Contributors
+  //
+
+  if (ERUDIT.config.public.contributors?.enabled) {
+    routes.push(PAGES.contributors);
+
+    const dbContributors = await ERUDIT.db.query.contributors.findMany({
+      columns: { contributorId: true },
+    });
+
+    for (const dbContributor of dbContributors) {
+      routes.push(PAGES.contributor(dbContributor.contributorId));
+    }
+  }
+
+  //
+  // Sponsors
+  //
+
+  if (ERUDIT.config.public.sponsors?.enabled) {
+    routes.push(PAGES.sponsors);
+  }
+
+  return routes;
+});