erudit 4.0.0-dev.3 → 4.0.0-dev.5

package/server/erudit/repository.ts

@@ -1,96 +1,96 @@
-import { getContentBreadcrumbs } from './content/repository/breadcrumbs';
-import { getContentLink } from './content/repository/contentLink';
-import {
-    getDefaultTopicPart,
-    getTopicParts,
-} from './content/repository/topicParts';
-import { countContributors } from './contributors/repository/count';
-import { countSponsors } from './sponsors/repository/count';
-import { resolveEruditProse } from './prose/repository/resolve';
-import { pushFile } from './db/repository/pushFile';
-import { pushProblemScript } from './db/repository/pushProblemScript';
-import { pushProseLink } from './db/repository/pushProseLink';
-import { getContentProse, getContributorProse } from './prose/repository/get';
-import { finalizeProse } from './prose/repository/finalize';
-import { getContentTitle } from './content/repository/title';
-import {
-    getContentHeadingUnique,
-    getContentUnique,
-} from './content/repository/unique';
-import { getContentDecoration } from './content/repository/decoration';
-import { getContentFlags } from './content/repository/flags';
-import { getContentConnections } from './content/repository/connections';
-import { getQuoteIds } from './quote/repository/ids';
-import { getContributorAvatarUrl } from './contributors/repository/avatarUrl';
-import { getSponsorAvatarUrl } from './sponsors/repository/avatarUrl';
-import { getContentDescription } from './content/repository/description';
-import { getContentChildren } from './content/repository/children';
-import {
-    addContentElementCount,
-    getContentStats,
-} from './content/repository/stats';
-import { countNewsBatches, getNewsNextBatch } from './news/repository/batch';
-import {
-    countContributions,
-    getContentContributions,
-    getContributorContributions,
-} from './contributors/repository/contributions';
-import { getContentSeo } from './content/repository/seo';
-import { getContentElementSnippets } from './content/repository/elementSnippets';
-
-export const repository = {
-    db: {
-        pushFile: pushFile,
-        pushProblemScript: pushProblemScript,
-        pushProseLink: pushProseLink,
-    },
-    contributors: {
-        count: countContributors,
-        countContributions,
-        contributorContributions: getContributorContributions,
-        avatarUrl: getContributorAvatarUrl,
-    },
-    quotes: {
-        ids: getQuoteIds,
-    },
-    sponsors: {
-        count: countSponsors,
-        avatarUrl: getSponsorAvatarUrl,
-    },
-    content: {
-        topicParts: getTopicParts,
-        defaultTopicPart: getDefaultTopicPart,
-        unique: getContentUnique,
-        uniqueHeading: getContentHeadingUnique,
-        link: getContentLink,
-        breadcrumbs: getContentBreadcrumbs,
-        title: getContentTitle,
-        description: getContentDescription,
-        decoration: getContentDecoration,
-        elementSnippets: getContentElementSnippets,
-        flags: getContentFlags,
-        connections: getContentConnections,
-        children: getContentChildren,
-        stats: getContentStats,
-        addElementCount: addContentElementCount,
-        contentContributions: getContentContributions,
-        seo: getContentSeo,
-    },
-    prose: {
-        resolve: resolveEruditProse,
-        getContent: getContentProse,
-        getContributor: getContributorProse,
-        finalize: finalizeProse,
-    },
-    news: {
-        countBatches: countNewsBatches,
-        batch: getNewsNextBatch,
-    },
-} as const;
-
-export type EruditServerRepository = typeof repository;
-
-export async function setupServerRepository() {
-    ERUDIT.repository = repository;
-    ERUDIT.log.success('Repository setup complete!');
-}
+import { getContentBreadcrumbs } from './content/repository/breadcrumbs';
+import { getContentLink } from './content/repository/contentLink';
+import {
+  getDefaultTopicPart,
+  getTopicParts,
+} from './content/repository/topicParts';
+import { countContributors } from './contributors/repository/count';
+import { countSponsors } from './sponsors/repository/count';
+import { resolveEruditProse } from './prose/repository/resolve';
+import { pushFile } from './db/repository/pushFile';
+import { pushProblemScript } from './db/repository/pushProblemScript';
+import { pushProseLink } from './db/repository/pushProseLink';
+import { getContentProse, getContributorProse } from './prose/repository/get';
+import { finalizeProse } from './prose/repository/finalize';
+import { getContentTitle } from './content/repository/title';
+import {
+  getContentHeadingUnique,
+  getContentUnique,
+} from './content/repository/unique';
+import { getContentDecoration } from './content/repository/decoration';
+import { getContentFlags } from './content/repository/flags';
+import { getContentConnections } from './content/repository/connections';
+import { getQuoteIds } from './quote/repository/ids';
+import { getContributorAvatarUrl } from './contributors/repository/avatarUrl';
+import { getSponsorAvatarUrl } from './sponsors/repository/avatarUrl';
+import { getContentDescription } from './content/repository/description';
+import { getContentChildren } from './content/repository/children';
+import {
+  addContentElementCount,
+  getContentStats,
+} from './content/repository/stats';
+import { countNewsBatches, getNewsNextBatch } from './news/repository/batch';
+import {
+  countContributions,
+  getContentContributions,
+  getContributorContributions,
+} from './contributors/repository/contributions';
+import { getContentSeo } from './content/repository/seo';
+import { getContentElementSnippets } from './content/repository/elementSnippets';
+
+export const repository = {
+  db: {
+    pushFile: pushFile,
+    pushProblemScript: pushProblemScript,
+    pushProseLink: pushProseLink,
+  },
+  contributors: {
+    count: countContributors,
+    countContributions,
+    contributorContributions: getContributorContributions,
+    avatarUrl: getContributorAvatarUrl,
+  },
+  quotes: {
+    ids: getQuoteIds,
+  },
+  sponsors: {
+    count: countSponsors,
+    avatarUrl: getSponsorAvatarUrl,
+  },
+  content: {
+    topicParts: getTopicParts,
+    defaultTopicPart: getDefaultTopicPart,
+    unique: getContentUnique,
+    uniqueHeading: getContentHeadingUnique,
+    link: getContentLink,
+    breadcrumbs: getContentBreadcrumbs,
+    title: getContentTitle,
+    description: getContentDescription,
+    decoration: getContentDecoration,
+    elementSnippets: getContentElementSnippets,
+    flags: getContentFlags,
+    connections: getContentConnections,
+    children: getContentChildren,
+    stats: getContentStats,
+    addElementCount: addContentElementCount,
+    contentContributions: getContentContributions,
+    seo: getContentSeo,
+  },
+  prose: {
+    resolve: resolveEruditProse,
+    getContent: getContentProse,
+    getContributor: getContributorProse,
+    finalize: finalizeProse,
+  },
+  news: {
+    countBatches: countNewsBatches,
+    batch: getNewsNextBatch,
+  },
+} as const;
+
+export type EruditServerRepository = typeof repository;
+
+export async function setupServerRepository() {
+  ERUDIT.repository = repository;
+  ERUDIT.log.success('Repository setup complete!');
+}

package/server/erudit/sponsors/build.ts

@@ -1,165 +1,161 @@
-import { readdirSync, readFileSync, existsSync } from 'node:fs';
-import { eq } from 'drizzle-orm';
-import type { Sponsor, SponsorConfig } from '@erudit-js/core/sponsor';
-
-let initialBuild = true;
-
-const sponsorsRoot = () => `${ERUDIT.config.paths.project}/sponsors`;
-
-export async function buildSponsors() {
-    if (!ERUDIT.config.public.project.sponsors?.enabled) {
-        return;
-    }
-
-    ERUDIT.log.debug.start('Building sponsors...');
-
-    const isInitial = initialBuild;
-    initialBuild = false;
-
-    const sponsorIds = collectSponsorIds(isInitial);
-
-    if (!sponsorIds.size) {
-        ERUDIT.log.info(
-            isInitial
-                ? 'Skipping sponsors — no sponsors found.'
-                : 'Skipping sponsors — nothing changed.',
-        );
-        return;
-    }
-
-    for (const sponsorId of sponsorIds) {
-        await cleanupSponsor(sponsorId);
-    }
-
-    const existingIds = [...sponsorIds].filter((id) =>
-        existsSync(`${sponsorsRoot()}/${id}`),
-    );
-
-    if (!existingIds.length) {
-        return;
-    }
-
-    for (const sponsorId of existingIds) {
-        await buildSponsor(sponsorId);
-    }
-
-    ERUDIT.log.success(
-        isInitial
-            ? `Sponsors build complete! (${ERUDIT.log.stress(sponsorIds.size)})`
-            : `Sponsors updated: ${ERUDIT.log.stress(existingIds.join(', '))}`,
-    );
-}
-
-//
-//
-//
-
-function collectSponsorIds(initial: boolean): Set<string> {
-    if (initial) {
-        try {
-            return new Set(
-                readdirSync(sponsorsRoot(), { withFileTypes: true })
-                    .filter((entry) => entry.isDirectory())
-                    .map((entry) => entry.name),
-            );
-        } catch {
-            return new Set();
-        }
-    }
-
-    const ids = new Set<string>();
-
-    for (const file of ERUDIT.changedFiles.values()) {
-        if (!file.startsWith(`${sponsorsRoot()}/`)) continue;
-        const id = file.replace(`${sponsorsRoot()}/`, '').split('/')[0];
-        if (id) ids.add(id);
-    }
-
-    return ids;
-}
-
-async function cleanupSponsor(sponsorId: string) {
-    await ERUDIT.db
-        .delete(ERUDIT.db.schema.sponsors)
-        .where(eq(ERUDIT.db.schema.sponsors.sponsorId, sponsorId));
-
-    await ERUDIT.db
-        .delete(ERUDIT.db.schema.files)
-        .where(eq(ERUDIT.db.schema.files.role, 'sponsor-avatar'));
-}
-
-async function buildSponsor(sponsorId: string) {
-    ERUDIT.log.debug.start(
-        `Building sponsor ${ERUDIT.log.stress(sponsorId)}...`,
-    );
-
-    const dir = `${sponsorsRoot()}/${sponsorId}`;
-    const files = readdirSync(dir);
-
-    const hasConfig = files.some(
-        (file) => file === 'sponsor.ts' || file === 'sponsor.js',
-    );
-
-    if (!hasConfig) {
-        ERUDIT.log.error(
-            `No config file found for sponsor ${ERUDIT.log.stress(sponsorId)}!`,
-        );
-        return;
-    }
-
-    let sponsorConfig: SponsorConfig;
-
-    try {
-        sponsorConfig = (await ERUDIT.import(
-            `${dir}/sponsor`,
-        )) as SponsorConfig;
-    } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        ERUDIT.log.error(
-            `Failed to load config for sponsor ${ERUDIT.log.stress(sponsorId)}: ${message}`,
-        );
-        return;
-    }
-
-    const avatarExtension = files
-        .find((file) => file.startsWith('avatar.'))
-        ?.split('.')
-        .pop();
-
-    if (avatarExtension) {
-        await ERUDIT.repository.db.pushFile(
-            `${dir}/avatar.${avatarExtension}`,
-            'sponsor-avatar',
-        );
-    }
-
-    const icon = (() => {
-        if (sponsorConfig.icon) {
-            return sponsorConfig.icon;
-        }
-
-        const iconFile = files.find((file) => file === 'icon.svg');
-        if (iconFile) {
-            return readFileSync(dir + '/' + iconFile, 'utf-8');
-        }
-    })();
-
-    const sponsor: Sponsor = {
-        sponsorId,
-        name: sponsorConfig.name,
-        group: sponsorConfig.group,
-        icon,
-        avatarExtension,
-        info: sponsorConfig.info,
-        color: sponsorConfig.color,
-        link: sponsorConfig.link,
-        messages: sponsorConfig.messages,
-    };
-
-    await ERUDIT.db.insert(ERUDIT.db.schema.sponsors).values({
-        sponsorId,
-        hasMessages: sponsor.messages?.enabled === true,
-        avatarExtension: sponsor.avatarExtension,
-        data: sponsor,
-    });
-}
+import { readdirSync, readFileSync, existsSync } from 'node:fs';
+import { eq } from 'drizzle-orm';
+import type { Sponsor, SponsorConfig } from '@erudit-js/core/sponsor';
+
+let initialBuild = true;
+
+const sponsorsRoot = () => ERUDIT.paths.project('sponsors');
+
+export async function buildSponsors() {
+  if (!ERUDIT.config.public.sponsors?.enabled) {
+    return;
+  }
+
+  ERUDIT.log.debug.start('Building sponsors...');
+
+  const isInitial = initialBuild;
+  initialBuild = false;
+
+  const sponsorIds = collectSponsorIds(isInitial);
+
+  if (!sponsorIds.size) {
+    ERUDIT.log.info(
+      isInitial
+        ? 'Skipping sponsors — no sponsors found.'
+        : 'Skipping sponsors — nothing changed.',
+    );
+    return;
+  }
+
+  for (const sponsorId of sponsorIds) {
+    await cleanupSponsor(sponsorId);
+  }
+
+  const existingIds = [...sponsorIds].filter((id) =>
+    existsSync(`${sponsorsRoot()}/${id}`),
+  );
+
+  if (!existingIds.length) {
+    return;
+  }
+
+  for (const sponsorId of existingIds) {
+    await buildSponsor(sponsorId);
+  }
+
+  ERUDIT.log.success(
+    isInitial
+      ? `Sponsors build complete! (${ERUDIT.log.stress(sponsorIds.size)})`
+      : `Sponsors updated: ${ERUDIT.log.stress(existingIds.join(', '))}`,
+  );
+}
+
+//
+//
+//
+
+function collectSponsorIds(initial: boolean): Set<string> {
+  if (initial) {
+    try {
+      return new Set(
+        readdirSync(sponsorsRoot(), { withFileTypes: true })
+          .filter((entry) => entry.isDirectory())
+          .map((entry) => entry.name),
+      );
+    } catch {
+      return new Set();
+    }
+  }
+
+  const ids = new Set<string>();
+
+  for (const file of ERUDIT.changedFiles.values()) {
+    if (!file.startsWith(`${sponsorsRoot()}/`)) continue;
+    const id = file.replace(`${sponsorsRoot()}/`, '').split('/')[0];
+    if (id) ids.add(id);
+  }
+
+  return ids;
+}
+
+async function cleanupSponsor(sponsorId: string) {
+  await ERUDIT.db
+    .delete(ERUDIT.db.schema.sponsors)
+    .where(eq(ERUDIT.db.schema.sponsors.sponsorId, sponsorId));
+
+  await ERUDIT.db
+    .delete(ERUDIT.db.schema.files)
+    .where(eq(ERUDIT.db.schema.files.role, 'sponsor-avatar'));
+}
+
+async function buildSponsor(sponsorId: string) {
+  ERUDIT.log.debug.start(`Building sponsor ${ERUDIT.log.stress(sponsorId)}...`);
+
+  const dir = `${sponsorsRoot()}/${sponsorId}`;
+  const files = readdirSync(dir);
+
+  const hasConfig = files.some(
+    (file) => file === 'sponsor.ts' || file === 'sponsor.js',
+  );
+
+  if (!hasConfig) {
+    ERUDIT.log.error(
+      `No config file found for sponsor ${ERUDIT.log.stress(sponsorId)}!`,
+    );
+    return;
+  }
+
+  let sponsorConfig: SponsorConfig;
+
+  try {
+    sponsorConfig = (await ERUDIT.import(`${dir}/sponsor`)) as SponsorConfig;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    ERUDIT.log.error(
+      `Failed to load config for sponsor ${ERUDIT.log.stress(sponsorId)}: ${message}`,
+    );
+    return;
+  }
+
+  const avatarExtension = files
+    .find((file) => file.startsWith('avatar.'))
+    ?.split('.')
+    .pop();
+
+  if (avatarExtension) {
+    await ERUDIT.repository.db.pushFile(
+      `${dir}/avatar.${avatarExtension}`,
+      'sponsor-avatar',
+    );
+  }
+
+  const icon = (() => {
+    if (sponsorConfig.icon) {
+      return sponsorConfig.icon;
+    }
+
+    const iconFile = files.find((file) => file === 'icon.svg');
+    if (iconFile) {
+      return readFileSync(dir + '/' + iconFile, 'utf-8');
+    }
+  })();
+
+  const sponsor: Sponsor = {
+    sponsorId,
+    name: sponsorConfig.name,
+    group: sponsorConfig.group,
+    icon,
+    avatarExtension,
+    info: sponsorConfig.info,
+    color: sponsorConfig.color,
+    link: sponsorConfig.link,
+    messages: sponsorConfig.messages,
+  };
+
+  await ERUDIT.db.insert(ERUDIT.db.schema.sponsors).values({
+    sponsorId,
+    hasMessages: sponsor.messages?.enabled === true,
+    avatarExtension: sponsor.avatarExtension,
+    data: sponsor,
+  });
+}

package/server/erudit/sponsors/repository/avatarUrl.ts

@@ -1,10 +1,10 @@
-export function getSponsorAvatarUrl(
-    sponsorId: string,
-    avatarExtension: string | undefined,
-): string | undefined {
-    if (!avatarExtension) {
-        return undefined;
-    }
-
-    return '/file/sponsors/' + sponsorId + '/avatar.' + avatarExtension;
-}
+export function getSponsorAvatarUrl(
+  sponsorId: string,
+  avatarExtension: string | undefined,
+): string | undefined {
+  if (!avatarExtension) {
+    return undefined;
+  }
+
+  return '/file/sponsors/' + sponsorId + '/avatar.' + avatarExtension;
+}

package/server/erudit/sponsors/repository/count.ts

@@ -1,4 +1,4 @@
-export async function countSponsors() {
-    const dbSponsors = await ERUDIT.db.query.sponsors.findMany();
-    return dbSponsors.length;
-}
+export async function countSponsors() {
+  const dbSponsors = await ERUDIT.db.query.sponsors.findMany();
+  return dbSponsors.length;
+}

package/server/erudit/staticFile.ts

@@ -1,28 +1,28 @@
-import { readFileSync } from 'node:fs';
-
-const mimeByExt: Record<string, string> = {
-    '.svg': 'image/svg+xml; charset=utf-8',
-    '.png': 'image/png',
-    '.jpg': 'image/jpeg',
-    '.jpeg': 'image/jpeg',
-    '.gif': 'image/gif',
-    '.webp': 'image/webp',
-    '.txt': 'text/plain; charset=utf-8',
-    '.json': 'application/json; charset=utf-8',
-    '.html': 'text/html; charset=utf-8',
-    '.css': 'text/css; charset=utf-8',
-    '.js': 'application/javascript; charset=utf-8',
-};
-
-function getMime(path: string): string {
-    const dot = path.lastIndexOf('.');
-    if (dot === -1) return 'application/octet-stream';
-    const ext = path.slice(dot).toLowerCase();
-    return mimeByExt[ext] || 'application/octet-stream';
-}
-
-export function serveStaticFile(event: any, path: string) {
-    const data = readFileSync(path);
-    event.node.res.setHeader('Content-Type', getMime(path));
-    return data;
-}
+import { readFileSync } from 'node:fs';
+
+const mimeByExt: Record<string, string> = {
+  '.svg': 'image/svg+xml; charset=utf-8',
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.txt': 'text/plain; charset=utf-8',
+  '.json': 'application/json; charset=utf-8',
+  '.html': 'text/html; charset=utf-8',
+  '.css': 'text/css; charset=utf-8',
+  '.js': 'application/javascript; charset=utf-8',
+};
+
+function getMime(path: string): string {
+  const dot = path.lastIndexOf('.');
+  if (dot === -1) return 'application/octet-stream';
+  const ext = path.slice(dot).toLowerCase();
+  return mimeByExt[ext] || 'application/octet-stream';
+}
+
+export function serveStaticFile(event: any, path: string) {
+  const data = readFileSync(path);
+  event.node.res.setHeader('Content-Type', getMime(path));
+  return data;
+}

package/server/plugins/augmentCss.ts

@@ -1,17 +1,17 @@
-export default defineNitroPlugin((nitro) => {
-    nitro.hooks.hook('render:html', (html) => {
-        const style = ERUDIT.config.public.project.style;
-        const brandColor = style?.brandColor;
-
-        const debug = ERUDIT.config.public.project.debug;
-        const slowTransition = debug.slowTransition;
-        html.head.push(`
-            <style>
-:root {
-    ${brandColor ? `--color-brand: ${brandColor};` : ''}
-    --duration-multiplier: ${slowTransition ? `2.5` : `1`};
-}
-            </style>
-        `);
-    });
-});
+export default defineNitroPlugin((nitro) => {
+  nitro.hooks.hook('render:html', (html) => {
+    const style = ERUDIT.config.public.style;
+    const brandColor = style?.brandColor;
+
+    const debug = ERUDIT.config.public.debug;
+    const slowTransition = debug.slowTransition;
+    html.head.push(`
+            <style>
+:root {
+    ${brandColor ? `--color-brand: ${brandColor};` : ''}
+    --duration-multiplier: ${slowTransition ? `2.5` : `1`};
+}
+            </style>
+        `);
+  });
+});

package/server/plugins/lang.ts

@@ -1,7 +1,5 @@
-export default defineNitroPlugin((nitro) => {
-    nitro.hooks.hook('render:html', (html) => {
-        html.htmlAttrs.push(
-            `lang="${ERUDIT.config.public.project.language.current}"`,
-        );
-    });
-});
+export default defineNitroPlugin((nitro) => {
+  nitro.hooks.hook('render:html', (html) => {
+    html.htmlAttrs.push(`lang="${ERUDIT.config.public.language.current}"`);
+  });
+});