erudit 4.0.0-dev.4 → 4.0.0

package/server/api/prerender/files.ts

@@ -1,10 +1,10 @@
-export default defineEventHandler(async () => {
-    const dbFiles = await ERUDIT.db.query.files.findMany();
-    const routes = new Set<string>();
-
-    for (const dbFile of dbFiles) {
-        routes.add(`/file/${dbFile.path}`);
-    }
-
-    return Array.from(routes);
-});
+export default defineEventHandler(async () => {
+  const dbFiles = await ERUDIT.db.query.files.findMany();
+  const routes = new Set<string>();
+
+  for (const dbFile of dbFiles) {
+    routes.add(`/file/${dbFile.path}`);
+  }
+
+  return Array.from(routes);
+});

package/server/api/prerender/frontNav.ts

@@ -1,13 +1,13 @@
-export default defineEventHandler(async () => {
-    const bookShortIds = Array.from(ERUDIT.contentNav.id2Books.values()).map(
-        (bookNode) => bookNode.shortId,
-    );
-
-    const routes: string[] = [];
-
-    for (const bookShortId of bookShortIds) {
-        routes.push(`/api/aside/major/frontNav/book/${bookShortId}`);
-    }
-
-    return routes;
-});
+export default defineEventHandler(async () => {
+  const bookShortIds = Array.from(ERUDIT.contentNav.id2Books.values()).map(
+    (bookNode) => bookNode.shortId,
+  );
+
+  const routes: string[] = [];
+
+  for (const bookShortId of bookShortIds) {
+    routes.push(`/api/aside/major/frontNav/book/${bookShortId}`);
+  }
+
+  return routes;
+});

package/server/api/prerender/language.ts

@@ -1,7 +1,7 @@
-export default defineEventHandler(async () => {
-    const phraseRoutes = Object.keys(ERUDIT.language.phrases).map(
-        (phraseKey) => `/api/language/phrase/${phraseKey}`,
-    );
-
-    return ['/api/language/functions', ...phraseRoutes];
-});
+export default defineEventHandler(async () => {
+  const phraseRoutes = Object.keys(ERUDIT.language.phrases).map(
+    (phraseKey) => `/api/language/phrase/${phraseKey}`,
+  );
+
+  return ['/api/language/functions', ...phraseRoutes];
+});

package/server/api/prerender/news.ts

@@ -1,8 +1,8 @@
-export default defineEventHandler(async () => {
-    const routes = new Set<string>(['/api/news/batch/0']);
-    const batchesNumber = await ERUDIT.repository.news.countBatches();
-    for (let batch = 0; batch < batchesNumber; batch++) {
-        routes.add(`/api/news/batch/${batch}`);
-    }
-    return Array.from(routes);
-});
+export default defineEventHandler(async () => {
+  const routes = new Set<string>(['/api/news/batch/0']);
+  const batchesNumber = await ERUDIT.repository.news.countBatches();
+  for (let batch = 0; batch < batchesNumber; batch++) {
+    routes.add(`/api/news/batch/${batch}`);
+  }
+  return Array.from(routes);
+});

package/server/api/prerender/quotes.ts

@@ -1,15 +1,15 @@
-export default defineEventHandler(async () => {
-    const routes: string[] = ['/api/quote/ids'];
-
-    const { cameo, sponsor } = await ERUDIT.repository.quotes.ids();
-
-    for (const cameoId of cameo ?? []) {
-        routes.push(`/api/quote/data/${cameoId}`);
-    }
-
-    for (const sponsorId of sponsor ?? []) {
-        routes.push(`/api/quote/data/${sponsorId}`);
-    }
-
-    return routes;
-});
+export default defineEventHandler(async () => {
+  const routes: string[] = ['/api/quote/ids'];
+
+  const { cameo, sponsor } = await ERUDIT.repository.quotes.ids();
+
+  for (const cameoId of cameo ?? []) {
+    routes.push(`/api/quote/data/${cameoId}`);
+  }
+
+  for (const sponsorId of sponsor ?? []) {
+    routes.push(`/api/quote/data/${sponsorId}`);
+  }
+
+  return routes;
+});

package/server/api/preview/contentPage/[...contentTypePath].ts

@@ -1,63 +1,63 @@
-import { eq } from 'drizzle-orm';
-
-export default defineEventHandler<Promise<PreviewContentPage>>(
-    async (event) => {
-        // <typeOrPart>/<fullOrShortId>.json
-        const strContentTypePath = event.context.params!.contentTypePath.slice(
-            0,
-            -5,
-        );
-
-        const contentTypePath = parseContentTypePath(strContentTypePath);
-        const fullId = contentTypePath.contentId;
-        const navNode = ERUDIT.contentNav.getNodeOrThrow(fullId);
-        const shortId = navNode.shortId;
-
-        const dbContent = (await ERUDIT.db.query.content.findFirst({
-            columns: {
-                title: true,
-                description: true,
-                // TODO: decoration svg!
-            },
-            where: eq(ERUDIT.db.schema.content.fullId, fullId),
-        }))!;
-
-        const bookNavNode = ERUDIT.contentNav.getBookFor(fullId);
-        let bookTitle: string | undefined;
-
-        if (bookNavNode) {
-            const dbBook = (await ERUDIT.db.query.content.findFirst({
-                columns: {
-                    title: true,
-                },
-                where: eq(ERUDIT.db.schema.content.fullId, bookNavNode.fullId),
-            }))!;
-
-            bookTitle = dbBook.title;
-        }
-
-        const link = (() => {
-            if (contentTypePath.type === 'topic') {
-                return PAGES.topic(contentTypePath.topicPart, shortId);
-            }
-
-            return PAGES[contentTypePath.type](shortId);
-        })();
-
-        const previewContentPage: PreviewContentPage = {
-            content:
-                contentTypePath.type === 'topic'
-                    ? {
-                          type: 'topic',
-                          topicPart: contentTypePath.topicPart,
-                      }
-                    : { type: contentTypePath.type },
-            link,
-            title: dbContent.title,
-            description: dbContent.description ?? undefined,
-            bookTitle,
-        };
-
-        return previewContentPage;
-    },
-);
+import { eq } from 'drizzle-orm';
+
+export default defineEventHandler<Promise<PreviewContentPage>>(
+  async (event) => {
+    // <typeOrPart>/<fullOrShortId>.json
+    const strContentTypePath = event.context.params!.contentTypePath.slice(
+      0,
+      -5,
+    );
+
+    const contentTypePath = parseContentTypePath(strContentTypePath);
+    const fullId = contentTypePath.contentId;
+    const navNode = ERUDIT.contentNav.getNodeOrThrow(fullId);
+    const shortId = navNode.shortId;
+
+    const dbContent = (await ERUDIT.db.query.content.findFirst({
+      columns: {
+        title: true,
+        description: true,
+        // TODO: decoration svg!
+      },
+      where: eq(ERUDIT.db.schema.content.fullId, fullId),
+    }))!;
+
+    const bookNavNode = ERUDIT.contentNav.getBookFor(fullId);
+    let bookTitle: string | undefined;
+
+    if (bookNavNode) {
+      const dbBook = (await ERUDIT.db.query.content.findFirst({
+        columns: {
+          title: true,
+        },
+        where: eq(ERUDIT.db.schema.content.fullId, bookNavNode.fullId),
+      }))!;
+
+      bookTitle = dbBook.title;
+    }
+
+    const link = (() => {
+      if (contentTypePath.type === 'topic') {
+        return PAGES.topic(contentTypePath.topicPart, shortId);
+      }
+
+      return PAGES[contentTypePath.type](shortId);
+    })();
+
+    const previewContentPage: PreviewContentPage = {
+      content:
+        contentTypePath.type === 'topic'
+          ? {
+              type: 'topic',
+              topicPart: contentTypePath.topicPart,
+            }
+          : { type: contentTypePath.type },
+      link,
+      title: dbContent.title,
+      description: dbContent.description ?? undefined,
+      bookTitle,
+    };
+
+    return previewContentPage;
+  },
+);

package/server/api/preview/contentUnique/[...contentTypePathUnique].ts

@@ -1,81 +1,73 @@
-import { mixSchema, uniqueName2Id, type ProseElement } from '@jsprose/core';
-import { headingSchema } from '@erudit-js/prose/elements/heading/core';
-import { detailsSchema } from '@erudit-js/prose/elements/details/core';
-
-export default defineEventHandler<Promise<PreviewContentUnique>>(
-    async (event) => {
-        // <typeOrPart>/<fullContentId>/<uniqueName>.json
-        const strContentTypePathUnique =
-            event.context.params!.contentTypePathUnique.slice(0, -5);
-        const parts = strContentTypePathUnique.split('/');
-
-        const strContentTypePath = parts.slice(0, -1).join('/');
-        const uniqueName = parts.at(-1)!;
-
-        const contentTypePath = parseContentTypePath(strContentTypePath);
-        const fullId = contentTypePath.contentId;
-        const navNode = ERUDIT.contentNav.getNodeOrThrow(fullId);
-        const shortId = navNode.shortId;
-
-        const contentTitle = await ERUDIT.repository.content.title(fullId);
-
-        const unique = await ERUDIT.repository.content.unique(
-            fullId,
-            contentTypePath.type === 'topic'
-                ? contentTypePath.topicPart
-                : 'page',
-            uniqueName,
-        );
-
-        const uniqueProse = await (async () => {
-            if (unique.prose.schemaName === headingSchema.name) {
-                return await ERUDIT.repository.content.uniqueHeading(
-                    fullId,
-                    contentTypePath.type === 'topic'
-                        ? contentTypePath.topicPart
-                        : 'page',
-                    uniqueName,
-                );
-            } else if (unique.prose.schemaName === detailsSchema.name) {
-                const mix: ProseElement<typeof mixSchema> = {
-                    __JSPROSE_element: true,
-                    schemaName: mixSchema.name,
-                    children: unique.prose.children!,
-                } as ProseElement<typeof mixSchema>;
-
-                return mix;
-            } else {
-                return unique.prose;
-            }
-        })();
-
-        const finalizedProse =
-            await ERUDIT.repository.prose.finalize(uniqueProse);
-
-        const link = (() => {
-            if (contentTypePath.type === 'topic') {
-                return PAGES.topic(
-                    contentTypePath.topicPart,
-                    shortId,
-                    uniqueName2Id(uniqueName),
-                );
-            }
-
-            return PAGES[contentTypePath.type](
-                shortId,
-                uniqueName2Id(uniqueName),
-            );
-        })();
-
-        const previewContentUnique: PreviewContentUnique = {
-            schemaName: unique.prose.schemaName,
-            elementTitle: unique.title || undefined,
-            fadeOverlay: unique.prose.schemaName === headingSchema.name,
-            contentTitle,
-            link,
-            ...finalizedProse,
-        };
-
-        return previewContentUnique;
-    },
-);
+import { mixSchema, uniqueName2Id, type ProseElement } from '@jsprose/core';
+import { headingSchema } from '@erudit-js/prose/elements/heading/core';
+import { detailsSchema } from '@erudit-js/prose/elements/details/core';
+
+export default defineEventHandler<Promise<PreviewContentUnique>>(
+  async (event) => {
+    // <typeOrPart>/<fullContentId>/<uniqueName>.json
+    const strContentTypePathUnique =
+      event.context.params!.contentTypePathUnique.slice(0, -5);
+    const parts = strContentTypePathUnique.split('/');
+
+    const strContentTypePath = parts.slice(0, -1).join('/');
+    const uniqueName = parts.at(-1)!;
+
+    const contentTypePath = parseContentTypePath(strContentTypePath);
+    const fullId = contentTypePath.contentId;
+    const navNode = ERUDIT.contentNav.getNodeOrThrow(fullId);
+    const shortId = navNode.shortId;
+
+    const contentTitle = await ERUDIT.repository.content.title(fullId);
+
+    const unique = await ERUDIT.repository.content.unique(
+      fullId,
+      contentTypePath.type === 'topic' ? contentTypePath.topicPart : 'page',
+      uniqueName,
+    );
+
+    const uniqueProse = await (async () => {
+      if (unique.prose.schemaName === headingSchema.name) {
+        return await ERUDIT.repository.content.uniqueHeading(
+          fullId,
+          contentTypePath.type === 'topic' ? contentTypePath.topicPart : 'page',
+          uniqueName,
+        );
+      } else if (unique.prose.schemaName === detailsSchema.name) {
+        const mix: ProseElement<typeof mixSchema> = {
+          __JSPROSE_element: true,
+          schemaName: mixSchema.name,
+          children: unique.prose.children!,
+        } as ProseElement<typeof mixSchema>;
+
+        return mix;
+      } else {
+        return unique.prose;
+      }
+    })();
+
+    const finalizedProse = await ERUDIT.repository.prose.finalize(uniqueProse);
+
+    const link = (() => {
+      if (contentTypePath.type === 'topic') {
+        return PAGES.topic(
+          contentTypePath.topicPart,
+          shortId,
+          uniqueName2Id(uniqueName),
+        );
+      }
+
+      return PAGES[contentTypePath.type](shortId, uniqueName2Id(uniqueName));
+    })();
+
+    const previewContentUnique: PreviewContentUnique = {
+      schemaName: unique.prose.schemaName,
+      elementTitle: unique.title || undefined,
+      fadeOverlay: unique.prose.schemaName === headingSchema.name,
+      contentTitle,
+      link,
+      ...finalizedProse,
+    };
+
+    return previewContentUnique;
+  },
+);

package/server/api/problemScript/[...problemScriptPath].ts

@@ -1,92 +1,88 @@
-import { resolve } from 'node:path';
-import { build, type Plugin } from 'esbuild';
-
-import { STATIC_ASSET_EXTENSIONS } from '@erudit/server/prose/transform/extensions';
-import { createGlobalContent } from '@erudit-js/core/content/global';
-
-export default defineEventHandler<Promise<string>>(async (event) => {
-    // <filepathToScriptFile>.js
-    const problemScriptPath = event.context.params!.problemScriptPath.slice(
-        0,
-        -3,
-    ); // remove .js
-
-    const buildResult = await build({
-        entryPoints: [
-            ERUDIT.config.paths.project + '/' + problemScriptPath + '.tsx',
-        ],
-        charset: 'utf8',
-        bundle: true,
-        treeShaking: true,
-        platform: 'neutral',
-        format: 'esm',
-        write: false,
-        define: {
-            $CONTRIBUTOR: '{}',
-        },
-        jsx: 'automatic',
-        plugins: [jsxRuntimePlugin, staticFilesPlugin],
-        alias: {
-            '#project': ERUDIT.config.paths.project + '/',
-            '#content': ERUDIT.config.paths.project + '/content/',
-        },
-    });
-
-    let code = buildResult.outputFiles[0].text;
-
-    // Transform $CONTENT patterns to link objects
-    code = code.replace(/\$CONTENT(\.[a-zA-Z_$][\w$]*)+/g, (match) => {
-        const path = match
-            .slice(8) // Remove '$CONTENT.'
-            .split('.')
-            .join('/');
-
-        return JSON.stringify(createGlobalContent(path));
-    });
-
-    // Insert script ID
-    code = code.replace(
-        'defineProblemScript(',
-        `defineProblemScript('__auto_generated__',`,
-    );
-
-    setHeader(event, 'Content-Type', 'text/javascript; charset=utf-8');
-    return code;
-});
-
-const jsxRuntimePlugin: Plugin = {
-    name: 'jsx-runtime',
-    setup(build) {
-        build.onResolve({ filter: /^react\/jsx-runtime$/ }, () => ({
-            path: 'jsx-runtime-shim',
-            namespace: 'jsx-runtime-shim',
-        }));
-
-        build.onLoad({ filter: /.*/, namespace: 'jsx-runtime-shim' }, () => ({
-            contents: `
-                export const jsx = globalThis.jsx;
-                export const jsxs = globalThis.jsxs;
-                export const Fragment = globalThis.Fragment;
-            `,
-            loader: 'js',
-        }));
-    },
-};
-
-const staticFilesPlugin: Plugin = {
-    name: 'static-files',
-    setup(build) {
-        build.onLoad(
-            {
-                filter: new RegExp(
-                    `\\.(${STATIC_ASSET_EXTENSIONS.join('|')})$`,
-                ),
-            },
-            async (args) => {
-                const absPath = resolve(args.path).replace(/\\/g, '/');
-                const contents = `export default ${JSON.stringify(absPath)};`;
-                return { contents, loader: 'js' };
-            },
-        );
-    },
-};
+import { resolve } from 'node:path';
+import { build, type Plugin } from 'esbuild';
+
+import { STATIC_ASSET_EXTENSIONS } from '#layers/erudit/server/erudit/prose/transform/extensions';
+import { createGlobalContent } from '@erudit-js/core/content/global';
+
+export default defineEventHandler<Promise<string>>(async (event) => {
+  // <filepathToScriptFile>.js
+  const problemScriptPath = event.context.params!.problemScriptPath.slice(
+    0,
+    -3,
+  ); // remove .js
+
+  const buildResult = await build({
+    entryPoints: [`${ERUDIT.paths.project(problemScriptPath)}.tsx`],
+    charset: 'utf8',
+    bundle: true,
+    treeShaking: true,
+    platform: 'neutral',
+    format: 'esm',
+    write: false,
+    define: {
+      $CONTRIBUTOR: '{}',
+    },
+    jsx: 'automatic',
+    plugins: [jsxRuntimePlugin, staticFilesPlugin],
+    alias: {
+      '#project': ERUDIT.paths.project() + '/',
+      '#content': ERUDIT.paths.project('content') + '/',
+    },
+  });
+
+  let code = buildResult.outputFiles[0].text;
+
+  // Transform $CONTENT patterns to link objects
+  code = code.replace(/\$CONTENT(\.[a-zA-Z_$][\w$]*)+/g, (match) => {
+    const path = match
+      .slice(8) // Remove '$CONTENT.'
+      .split('.')
+      .join('/');
+
+    return JSON.stringify(createGlobalContent(path));
+  });
+
+  // Insert script ID
+  code = code.replace(
+    'defineProblemScript(',
+    `defineProblemScript('__auto_generated__',`,
+  );
+
+  setHeader(event, 'Content-Type', 'text/javascript; charset=utf-8');
+  return code;
+});
+
+const jsxRuntimePlugin: Plugin = {
+  name: 'jsx-runtime',
+  setup(build) {
+    build.onResolve({ filter: /^react\/jsx-runtime$/ }, () => ({
+      path: 'jsx-runtime-shim',
+      namespace: 'jsx-runtime-shim',
+    }));
+
+    build.onLoad({ filter: /.*/, namespace: 'jsx-runtime-shim' }, () => ({
+      contents: `
+                export const jsx = globalThis.jsx;
+                export const jsxs = globalThis.jsxs;
+                export const Fragment = globalThis.Fragment;
+            `,
+      loader: 'js',
+    }));
+  },
+};
+
+const staticFilesPlugin: Plugin = {
+  name: 'static-files',
+  setup(build) {
+    build.onLoad(
+      {
+        filter: new RegExp(`\\.(${STATIC_ASSET_EXTENSIONS.join('|')})$`),
+      },
+      async (args) => {
+        const absPath = resolve(args.path).replace(/\\/g, '/');
+        const contents = `export default ${JSON.stringify(absPath)};`;
+        return { contents, loader: 'js' };
+      },
+    );
+  },
+};