erudit 4.0.0-dev.4 → 4.0.0

package/server/api/quote/data/[quoteId].ts

@@ -1,87 +1,84 @@
-import { eq } from 'drizzle-orm';
-import {
-    parseQuoteId,
-    type CameoQuote,
-    type Quote,
-    type SponsorQuote,
-} from '@erudit-js/core/quote';
-
-export default defineEventHandler<Promise<Quote>>(async (event) => {
-    const quoteId = event.context.params?.quoteId;
-
-    if (!quoteId) {
-        throw createError({
-            statusCode: 400,
-            message: 'Quote ID is required!',
-        });
-    }
-
-    const { type, id } = parseQuoteId(quoteId);
-
-    if (type === 'cameo') {
-        const dbCameo = await ERUDIT.db.query.cameos.findFirst({
-            columns: { data: true },
-            where: eq(ERUDIT.db.schema.cameos.cameoId, id),
-        });
-
-        if (!dbCameo) {
-            throw createError({
-                statusCode: 404,
-                message: `Failed to find cameo with ID "${id}"!`,
-            });
-        }
-
-        const data = dbCameo.data;
-
-        const quote: CameoQuote = {
-            type: 'cameo',
-            name: data.name,
-            messages: data.messages,
-            icon: data.icon,
-            color: data.color,
-            link: data.link,
-            avatarUrl: `/file/cameos/${id}/avatar.${data.avatarExtension}`,
-        };
-
-        return quote;
-    } else if (type === 'sponsor') {
-        const dbSponsor = await ERUDIT.db.query.sponsors.findFirst({
-            columns: { data: true },
-            where: eq(ERUDIT.db.schema.sponsors.sponsorId, id),
-        });
-
-        if (!dbSponsor) {
-            throw createError({
-                statusCode: 404,
-                message: `Failed to find cameo with ID "${id}"!`,
-            });
-        }
-
-        const data = dbSponsor.data;
-
-        const quote: SponsorQuote = {
-            type: 'sponsor',
-            name: data.name ?? id,
-            color: data.color,
-            icon: data.icon,
-            link: data.link,
-            avatarUrl: ERUDIT.repository.sponsors.avatarUrl(
-                id,
-                data.avatarExtension,
-            ),
-        };
-
-        if (data.messages?.enabled === true) {
-            if (data.messages.list) {
-                quote.messages = data.messages.list;
-            }
-        }
-
-        return quote;
-    }
-
-    throw createError({
-        statusCode: 400,
-        message: `Unable to resolve quote ID "${quoteId}"!`,
-    });
-});
+import { eq } from 'drizzle-orm';
+import {
+  parseQuoteId,
+  type CameoQuote,
+  type Quote,
+  type SponsorQuote,
+} from '@erudit-js/core/quote';
+
+export default defineEventHandler<Promise<Quote>>(async (event) => {
+  const quoteId = event.context.params?.quoteId;
+
+  if (!quoteId) {
+    throw createError({
+      statusCode: 400,
+      message: 'Quote ID is required!',
+    });
+  }
+
+  const { type, id } = parseQuoteId(quoteId);
+
+  if (type === 'cameo') {
+    const dbCameo = await ERUDIT.db.query.cameos.findFirst({
+      columns: { data: true },
+      where: eq(ERUDIT.db.schema.cameos.cameoId, id),
+    });
+
+    if (!dbCameo) {
+      throw createError({
+        statusCode: 404,
+        message: `Failed to find cameo with ID "${id}"!`,
+      });
+    }
+
+    const data = dbCameo.data;
+
+    const quote: CameoQuote = {
+      type: 'cameo',
+      name: data.name,
+      messages: data.messages,
+      icon: data.icon,
+      color: data.color,
+      link: data.link,
+      avatarUrl: `/file/cameos/${id}/avatar.${data.avatarExtension}`,
+    };
+
+    return quote;
+  } else if (type === 'sponsor') {
+    const dbSponsor = await ERUDIT.db.query.sponsors.findFirst({
+      columns: { data: true },
+      where: eq(ERUDIT.db.schema.sponsors.sponsorId, id),
+    });
+
+    if (!dbSponsor) {
+      throw createError({
+        statusCode: 404,
+        message: `Failed to find cameo with ID "${id}"!`,
+      });
+    }
+
+    const data = dbSponsor.data;
+
+    const quote: SponsorQuote = {
+      type: 'sponsor',
+      name: data.name ?? id,
+      color: data.color,
+      icon: data.icon,
+      link: data.link,
+      avatarUrl: ERUDIT.repository.sponsors.avatarUrl(id, data.avatarExtension),
+    };
+
+    if (data.messages?.enabled === true) {
+      if (data.messages.list) {
+        quote.messages = data.messages.list;
+      }
+    }
+
+    return quote;
+  }
+
+  throw createError({
+    statusCode: 400,
+    message: `Unable to resolve quote ID "${quoteId}"!`,
+  });
+});

package/server/api/quote/ids.ts

@@ -1,3 +1,3 @@
-export default defineEventHandler(async () => {
-    return await ERUDIT.repository.quotes.ids();
-});
+export default defineEventHandler(async () => {
+  return await ERUDIT.repository.quotes.ids();
+});

package/server/erudit/build.ts

@@ -1,137 +1,132 @@
-import chalk from 'chalk';
-import chokidar from 'chokidar';
-import { debounce } from 'perfect-debounce';
-import slash from 'slash';
-
-// Builders
-import { buildContributors } from './contributors/build';
-import { buildSponsors } from './sponsors/build';
-import { buildCameos } from './cameos/build';
-import { buildContentNav } from './content/nav/build';
-import { requestFullContentResolve, resolveContent } from './content/resolve';
-import { buildGlobalContent } from './content/global/build';
-import { buildNews } from './news/build';
-
-export type EruditServerChangedFiles = Set<string>;
-export type EruditServerBuildError = Error | undefined;
-
-export async function buildServerErudit() {
-    ERUDIT.buildPromise = (async () => {
-        ERUDIT.buildError = undefined;
-
-        try {
-            ERUDIT.log.start('Building...');
-            await buildContributors();
-            await buildSponsors();
-            await buildCameos();
-            await buildNews();
-            await buildContentNav();
-            await buildGlobalContent();
-            await resolveContent();
-            ERUDIT.log.success(chalk.green('Build Complete!'));
-        } catch (buildError) {
-            requestFullContentResolve();
-
-            if (buildError instanceof Error) {
-                ERUDIT.buildError = buildError;
-                if (buildError.stack) {
-                    ERUDIT.log.error(buildError.stack);
-                }
-            } else {
-                ERUDIT.buildError = createError({
-                    statusCode: 500,
-                    statusMessage: 'Unknown Erudit Build Error!',
-                    message:
-                        typeof buildError === 'string'
-                            ? buildError
-                            : 'An unknown error occurred!',
-                });
-                ERUDIT.log.error(ERUDIT.buildError.message);
-            }
-        }
-    })();
-
-    await ERUDIT.buildPromise;
-}
-
-//
-// Watcher
-//
-
-export async function tryServerWatchProject() {
-    if (
-        ERUDIT.config.public.mode !== 'write' &&
-        ERUDIT.config.public.mode !== 'dev'
-    ) {
-        return;
-    }
-
-    let pendingRebuild = false;
-    ERUDIT.changedFiles = new Set<string>();
-
-    const tryRebuildErudit = debounce(async () => {
-        pendingRebuild = true;
-        try {
-            await ERUDIT.buildPromise;
-            const files = Array.from(ERUDIT.changedFiles);
-            console.log();
-            ERUDIT.log.warn(
-                `${chalk.yellow('Rebuilding due to file change(s):')}\n\n` +
-                    files
-                        .map((p, i) => chalk.gray(`${i + 1} -`) + ` "${p}"`)
-                        .join('\n'),
-            );
-            console.log();
-            await buildServerErudit();
-            ERUDIT.changedFiles.clear();
-        } finally {
-            ERUDIT.changedFiles.clear();
-            pendingRebuild = false;
-        }
-    }, 300);
-
-    function isWatched(path: string) {
-        if (path.startsWith(ERUDIT.config.paths.project + '/content/')) {
-            return true;
-        }
-
-        if (path.startsWith(ERUDIT.config.paths.project + '/contributors/')) {
-            return true;
-        }
-
-        if (path.startsWith(ERUDIT.config.paths.project + '/cameos/')) {
-            return true;
-        }
-
-        if (path.startsWith(ERUDIT.config.paths.project + '/sponsors/')) {
-            return true;
-        }
-
-        if (path.startsWith(ERUDIT.config.paths.project + '/news/')) {
-            return true;
-        }
-    }
-
-    const watcher = chokidar.watch(ERUDIT.config.paths.project, {
-        ignoreInitial: true,
-    });
-
-    watcher.on('all', (_, path) => {
-        path = slash(path);
-
-        if (!isWatched(path)) {
-            return;
-        }
-
-        if (pendingRebuild) {
-            return;
-        }
-
-        if (path.trim()) {
-            ERUDIT.changedFiles.add(String(path));
-            tryRebuildErudit();
-        }
-    });
-
-    ERUDIT.log.success('Server project watcher is active 👀');
-}
+import chalk from 'chalk';
+import chokidar from 'chokidar';
+import { debounce } from 'perfect-debounce';
+import { sn } from 'unslash';
+
+// Builders
+import { buildContributors } from './contributors/build';
+import { buildSponsors } from './sponsors/build';
+import { buildCameos } from './cameos/build';
+import { buildContentNav } from './content/nav/build';
+import { requestFullContentResolve, resolveContent } from './content/resolve';
+import { buildGlobalContent } from './content/global/build';
+import { buildNews } from './news/build';
+
+export type EruditServerChangedFiles = Set<string>;
+export type EruditServerBuildError = Error | undefined;
+
+export async function buildServerErudit() {
+  ERUDIT.buildPromise = (async () => {
+    ERUDIT.buildError = undefined;
+
+    try {
+      ERUDIT.log.start('Building...');
+      await buildContributors();
+      await buildSponsors();
+      await buildCameos();
+      await buildNews();
+      await buildContentNav();
+      await buildGlobalContent();
+      await resolveContent();
+      ERUDIT.log.success(chalk.green('Build Complete!'));
+    } catch (buildError) {
+      requestFullContentResolve();
+
+      if (buildError instanceof Error) {
+        ERUDIT.buildError = buildError;
+        if (buildError.stack) {
+          ERUDIT.log.error(buildError.stack);
+        }
+      } else {
+        ERUDIT.buildError = createError({
+          statusCode: 500,
+          statusMessage: 'Unknown Erudit Build Error!',
+          message:
+            typeof buildError === 'string'
+              ? buildError
+              : 'An unknown error occurred!',
+        });
+        ERUDIT.log.error(ERUDIT.buildError.message);
+      }
+    }
+  })();
+
+  await ERUDIT.buildPromise;
+}
+
+//
+// Watcher
+//
+
+export async function tryServerWatchProject() {
+  if (ERUDIT.mode === 'static') {
+    return;
+  }
+
+  let pendingRebuild = false;
+  ERUDIT.changedFiles = new Set<string>();
+
+  const tryRebuildErudit = debounce(async () => {
+    pendingRebuild = true;
+    try {
+      await ERUDIT.buildPromise;
+      const files = Array.from(ERUDIT.changedFiles);
+      console.log();
+      ERUDIT.log.warn(
+        `${chalk.yellow('Rebuilding due to file change(s):')}\n\n` +
+          files.map((p, i) => chalk.gray(`${i + 1} -`) + ` "${p}"`).join('\n'),
+      );
+      console.log();
+      await buildServerErudit();
+      ERUDIT.changedFiles.clear();
+    } finally {
+      ERUDIT.changedFiles.clear();
+      pendingRebuild = false;
+    }
+  }, 300);
+
+  function isWatched(path: string) {
+    if (path.startsWith(ERUDIT.paths.project('content') + '/')) {
+      return true;
+    }
+
+    if (path.startsWith(ERUDIT.paths.project('contributors') + '/')) {
+      return true;
+    }
+
+    if (path.startsWith(ERUDIT.paths.project('cameos') + '/')) {
+      return true;
+    }
+
+    if (path.startsWith(ERUDIT.paths.project('sponsors') + '/')) {
+      return true;
+    }
+
+    if (path.startsWith(ERUDIT.paths.project('news') + '/')) {
+      return true;
+    }
+  }
+
+  const watcher = chokidar.watch(ERUDIT.paths.project(), {
+    ignoreInitial: true,
+  });
+
+  watcher.on('all', (_, path) => {
+    path = sn(path);
+
+    if (!isWatched(path)) {
+      return;
+    }
+
+    if (pendingRebuild) {
+      return;
+    }
+
+    if (path.trim()) {
+      ERUDIT.changedFiles.add(String(path));
+      tryRebuildErudit();
+    }
+  });
+
+  ERUDIT.log.success('Server project watcher is active 👀');
+}