erudit 4.0.0-dev.4 → 4.0.0-dev.5

package/server/erudit/db/types.ts

@@ -1,10 +1,10 @@
-import { LibSQLDatabase } from 'drizzle-orm/libsql';
-import type { Database } from 'better-sqlite3';
-
-import type * as schema from './schema';
-
-export type EruditServerDatabase = LibSQLDatabase<typeof schema> & {
-    path: string;
-    connection: Database;
-    schema: typeof schema;
-};
+import { LibSQLDatabase } from 'drizzle-orm/libsql';
+import type { Database } from 'better-sqlite3';
+
+import type * as schema from './schema';
+
+export type EruditServerDatabase = LibSQLDatabase<typeof schema> & {
+  path: string;
+  connection: Database;
+  schema: typeof schema;
+};

package/server/erudit/global.ts

@@ -1,33 +1,38 @@
-import type { EruditServerBuildError, EruditServerChangedFiles } from './build';
-import type { EruditServerConfig } from './config';
-import type { EruditServerContentNav } from './content/nav/types';
-import type { EruditServerDatabase } from './db/types';
-import type { EruditServerImporter } from './importer';
-import type { EruditServerLanguage } from './language/types';
-import type { EruditServerLogger } from './logger';
-import type { EruditServerRepository } from './repository';
-
-export const ERUDIT: {
-    buildError: EruditServerBuildError;
-    buildPromise: Promise<void>;
-    changedFiles: EruditServerChangedFiles;
-    config: EruditServerConfig;
-    log: EruditServerLogger;
-    language: EruditServerLanguage;
-    db: EruditServerDatabase;
-    repository: EruditServerRepository;
-    contentNav: EruditServerContentNav;
-    import: EruditServerImporter;
-} = {} as any;
-
-Object.assign(globalThis, {
-    defineContributor,
-    defineSponsor,
-    defineCameo,
-    defineBook,
-    defineTopic,
-    definePage,
-    defineGroup,
-    defineProse,
-    Include,
-});
+import type { EruditMode } from '@erudit-js/core/mode';
+
+import type { EruditServerBuildError, EruditServerChangedFiles } from './build';
+import type { EruditServerConfig } from './config';
+import type { EruditServerContentNav } from './content/nav/types';
+import type { EruditServerDatabase } from './db/types';
+import type { EruditServerImporter } from './importer';
+import type { EruditServerLanguage } from './language/types';
+import type { EruditServerLogger } from './logger';
+import type { EruditServerPaths } from './path';
+import type { EruditServerRepository } from './repository';
+
+export const ERUDIT: {
+  buildError: EruditServerBuildError;
+  buildPromise: Promise<void>;
+  changedFiles: EruditServerChangedFiles;
+  config: EruditServerConfig;
+  log: EruditServerLogger;
+  language: EruditServerLanguage;
+  db: EruditServerDatabase;
+  repository: EruditServerRepository;
+  contentNav: EruditServerContentNav;
+  paths: EruditServerPaths;
+  mode: EruditMode;
+  import: EruditServerImporter;
+} = {} as any;
+
+Object.assign(globalThis, {
+  defineContributor,
+  defineSponsor,
+  defineCameo,
+  defineBook,
+  defineTopic,
+  definePage,
+  defineGroup,
+  defineProse,
+  Include,
+});

package/server/erudit/importer.ts

@@ -1,97 +1,94 @@
-import { createJiti, type Jiti, type JitiOptions } from 'jiti';
-import slash from 'slash';
-import { insertDocumentId } from '@jsprose/core';
-import {
-    pathToDocumentId,
-    stringifyDocumentId,
-} from '@erudit-js/core/prose/documentId';
-import { insertProblemScriptId } from '@erudit-js/prose/elements/problem/problemScript';
-
-import {
-    EXTENSIONS,
-    STATIC_ASSET_EXTENSIONS,
-} from './prose/transform/extensions';
-
-export type EruditServerImporter = Jiti['import'];
-
-export let jiti: Jiti;
-
-export async function setupServerImporter() {
-    const jitiId = ERUDIT.config.paths.project;
-    const defaultJiti = createJiti(jitiId, createBaseJitiOptions());
-    const getDefaultCode = defaultJiti.transform.bind(defaultJiti);
-
-    jiti = createJiti(ERUDIT.config.paths.project, {
-        ...createBaseJitiOptions(),
-        extensions: EXTENSIONS.map((ext) => '.' + ext),
-        transform: (opts) => {
-            if (!opts.filename) {
-                return { code: getDefaultCode(opts) };
-            }
-
-            const filename = slash(opts.filename).replace('file://', '');
-
-            const staticAssetModule = tryStaticAssetModule(filename);
-            if (staticAssetModule) {
-                return staticAssetModule;
-            }
-
-            let code = getDefaultCode(opts);
-
-            //
-            // Insert IDs in `defineDocument(...)` calls
-            //
-
-            const documentId = pathToDocumentId(
-                filename,
-                ERUDIT.config.paths.project,
-            );
-
-            if (documentId) {
-                code = insertDocumentId({
-                    code,
-                    documentId: stringifyDocumentId(documentId),
-                    aliasName: 'defineProse',
-                });
-            }
-
-            //
-            // Problem Scripts
-            //
-
-            code = insertProblemScriptId(filename, code);
-
-            return { code };
-        },
-    });
-
-    ERUDIT.import = jiti.import;
-
-    ERUDIT.log.success('Importer setup complete!');
-}
-
-function createBaseJitiOptions(): JitiOptions {
-    return {
-        fsCache: false,
-        moduleCache: false,
-        alias: {
-            '#project/': ERUDIT.config.paths.project + '/',
-            '#content/': ERUDIT.config.paths.project + '/content/',
-        },
-        jsx: {
-            runtime: 'automatic',
-            importSource: '@jsprose/core',
-        },
-    };
-}
-
-function tryStaticAssetModule(filename: unknown) {
-    if (
-        typeof filename === 'string' &&
-        STATIC_ASSET_EXTENSIONS.some((ext) => filename.endsWith('.' + ext))
-    ) {
-        return {
-            code: `exports.default = "${filename}";`,
-        };
-    }
-}
+import { createJiti, type Jiti, type JitiOptions } from 'jiti';
+import { insertDocumentId } from '@jsprose/core';
+import { sn } from 'unslash';
+import {
+  pathToDocumentId,
+  stringifyDocumentId,
+} from '@erudit-js/core/prose/documentId';
+import { insertProblemScriptId } from '@erudit-js/prose/elements/problem/problemScript';
+
+import {
+  EXTENSIONS,
+  STATIC_ASSET_EXTENSIONS,
+} from './prose/transform/extensions';
+
+export type EruditServerImporter = Jiti['import'];
+
+export let jiti: Jiti;
+
+export async function setupServerImporter() {
+  const jitiId = ERUDIT.paths.project();
+  const defaultJiti = createJiti(jitiId, createBaseJitiOptions());
+  const getDefaultCode = defaultJiti.transform.bind(defaultJiti);
+
+  jiti = createJiti(jitiId, {
+    ...createBaseJitiOptions(),
+    extensions: EXTENSIONS.map((ext) => '.' + ext),
+    transform: (opts) => {
+      if (!opts.filename) {
+        return { code: getDefaultCode(opts) };
+      }
+
+      const filename = sn(opts.filename).replace('file://', '');
+
+      const staticAssetModule = tryStaticAssetModule(filename);
+      if (staticAssetModule) {
+        return staticAssetModule;
+      }
+
+      let code = getDefaultCode(opts);
+
+      //
+      // Insert IDs in `defineDocument(...)` calls
+      //
+
+      const documentId = pathToDocumentId(filename, ERUDIT.paths.project());
+
+      if (documentId) {
+        code = insertDocumentId({
+          code,
+          documentId: stringifyDocumentId(documentId),
+          aliasName: 'defineProse',
+        });
+      }
+
+      //
+      // Problem Scripts
+      //
+
+      code = insertProblemScriptId(filename, code);
+
+      return { code };
+    },
+  });
+
+  ERUDIT.import = jiti.import;
+
+  ERUDIT.log.success('Importer setup complete!');
+}
+
+function createBaseJitiOptions(): JitiOptions {
+  return {
+    fsCache: false,
+    moduleCache: false,
+    alias: {
+      '#project/': ERUDIT.paths.project() + '/',
+      '#content/': ERUDIT.paths.project('content') + '/',
+    },
+    jsx: {
+      runtime: 'automatic',
+      importSource: '@jsprose/core',
+    },
+  };
+}
+
+function tryStaticAssetModule(filename: unknown) {
+  if (
+    typeof filename === 'string' &&
+    STATIC_ASSET_EXTENSIONS.some((ext) => filename.endsWith('.' + ext))
+  ) {
+    return {
+      code: `exports.default = "${filename}";`,
+    };
+  }
+}

package/server/erudit/index.ts

@@ -1,90 +1,96 @@
-import chalk from 'chalk';
-
-import { setupServerLogger } from './logger';
-import { setupServerRuntimeConfig } from './config';
-import { setupServerLanguage } from './language/setup';
-import { setupServerDatabase } from './db/setup';
-import { setupServerImporter } from './importer';
-import { setupServerRepository } from './repository';
-import { setupServerContentNav } from './content/nav/setup';
-import { buildServerErudit, tryServerWatchProject } from './build';
-
-let serverSetupPromise: Promise<void>;
-
-export default defineNitroPlugin((nitro) => {
-    serverSetupPromise = setupServer();
-
-    nitro.hooks.hook('request', async (event) => {
-        await serverSetupPromise;
-        await ERUDIT.buildPromise;
-
-        if (ERUDIT.buildError) {
-            const accept = getHeader(event, 'accept') || '';
-            if (accept.includes('text/html')) {
-                function escapeHtml(str: string) {
-                    return str
-                        .replace(/&/g, '&amp;')
-                        .replace(/</g, '&lt;')
-                        .replace(/>/g, '&gt;')
-                        .replace(/"/g, '&quot;')
-                        .replace(/'/g, '&#39;');
-                }
-
-                event.node.res.end(`
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title>Erudit Build Error</title>
-        <style>
-        :root {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen;
-        }
-        </style>
-    </head>
-    <body>
-    <h1>Erudit Build Error</h1>
-    <pre style="padding: 1em; border-radius: 4px; overflow-x: auto;">
-${escapeHtml(ERUDIT.buildError.stack || '')}
-    </pre>
-    </body>
-</html>
-  `);
-            }
-        }
-    });
-
-    nitro.hooks.hook('close', async () => {});
-});
-
-async function setupServer() {
-    try {
-        const { registerProseGlobals } = await import('#erudit/prose/global');
-        registerProseGlobals();
-
-        await setupServerRuntimeConfig();
-        await setupServerLogger();
-        await setupServerImporter();
-        await setupServerLanguage();
-        await setupServerDatabase();
-        await setupServerRepository();
-        await setupServerContentNav();
-        ERUDIT.log.success(chalk.green('Setup Complete!'));
-
-        await tryServerWatchProject();
-        await buildServerErudit();
-    } catch (buildError) {
-        if (buildError instanceof Error) {
-            ERUDIT.buildError = buildError;
-        } else {
-            ERUDIT.buildError = createError({
-                statusCode: 500,
-                statusMessage: 'Unknown Erudit Server Error',
-                message:
-                    typeof buildError === 'string'
-                        ? buildError
-                        : 'An unknown error occurred!',
-            });
-        }
-    }
-}
+import chalk from 'chalk';
+import type { EruditMode } from '@erudit-js/core/mode';
+
+import { setupServerLogger } from './logger';
+import { setupServerRuntimeConfig } from './config';
+import { setupServerLanguage } from './language/setup';
+import { setupServerDatabase } from './db/setup';
+import { setupServerImporter } from './importer';
+import { setupServerRepository } from './repository';
+import { setupServerContentNav } from './content/nav/setup';
+import { buildServerErudit, tryServerWatchProject } from './build';
+import { setupServerPaths } from './path';
+
+let serverSetupPromise: Promise<void>;
+
+export default defineNitroPlugin((nitro) => {
+  serverSetupPromise = setupServer();
+
+  nitro.hooks.hook('request', async (event) => {
+    await serverSetupPromise;
+    await ERUDIT.buildPromise;
+
+    if (ERUDIT.buildError) {
+      const accept = getHeader(event, 'accept') || '';
+      if (accept.includes('text/html')) {
+        function escapeHtml(str: string) {
+          return str
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+        }
+
+        event.node.res.end(`
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>Erudit Build Error</title>
+        <style>
+        :root {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen;
+        }
+        </style>
+    </head>
+    <body>
+    <h1>Erudit Build Error</h1>
+    <pre style="padding: 1em; border-radius: 4px; overflow-x: auto;">
+${escapeHtml(ERUDIT.buildError.stack || '')}
+    </pre>
+    </body>
+</html>
+  `);
+      }
+    }
+  });
+
+  nitro.hooks.hook('close', async () => {});
+});
+
+async function setupServer() {
+  try {
+    const { registerProseGlobals } = await import('#erudit/prose/global');
+    registerProseGlobals();
+
+    const runtimeConfig = useRuntimeConfig();
+
+    ERUDIT.mode = runtimeConfig.public.eruditMode as EruditMode;
+    await setupServerPaths();
+    await setupServerRuntimeConfig();
+    await setupServerLogger();
+    await setupServerImporter();
+    await setupServerLanguage();
+    await setupServerDatabase();
+    await setupServerRepository();
+    await setupServerContentNav();
+    ERUDIT.log.success(chalk.green('Setup Complete!'));
+
+    await tryServerWatchProject();
+    await buildServerErudit();
+  } catch (buildError) {
+    if (buildError instanceof Error) {
+      ERUDIT.buildError = buildError;
+    } else {
+      ERUDIT.buildError = createError({
+        statusCode: 500,
+        statusMessage: 'Unknown Erudit Server Error',
+        message:
+          typeof buildError === 'string'
+            ? buildError
+            : 'An unknown error occurred!',
+      });
+    }
+  }
+}