erudit 3.0.0-dev.2 → 3.0.0-dev.21

package/server/plugin/db/entities/Topic.ts

@@ -1,20 +1,20 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-import type { TopicPart } from 'erudit-cog/schema';
-
-@Entity('topic')
-export class DbTopic {
-    @PrimaryColumn('varchar')
-    contentId!: string;
-
-    @Column('simple-array')
-    parts!: TopicPart[];
-
-    @Column('text', { nullable: true })
-    article?: string;
-
-    @Column('text', { nullable: true })
-    summary?: string;
-
-    @Column('text', { nullable: true })
-    practice?: string;
-}
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+import type { TopicPart } from '@erudit-js/cog/schema';
+
+@Entity('topic')
+export class DbTopic {
+    @PrimaryColumn('varchar')
+    contentId!: string;
+
+    @Column('simple-array')
+    parts!: TopicPart[];
+
+    @Column('text', { nullable: true })
+    article?: string;
+
+    @Column('text', { nullable: true })
+    summary?: string;
+
+    @Column('text', { nullable: true })
+    practice?: string;
+}

package/server/plugin/db/entities/Unique.ts

@@ -1,21 +1,21 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-
-import type { BitranContext } from '@erudit/shared/bitran/context';
-
-@Entity('unique')
-export class DbUnique {
-    @PrimaryColumn('varchar')
-    location!: string;
-
-    @Column('varchar')
-    productName!: string;
-
-    @Column('text')
-    content!: string;
-
-    @Column('simple-json')
-    context!: BitranContext;
-
-    @Column('varchar', { nullable: true })
-    title?: string;
-}
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+
+import type { BitranContext } from '@erudit/shared/bitran/context';
+
+@Entity('unique')
+export class DbUnique {
+    @PrimaryColumn('varchar')
+    location!: string;
+
+    @Column('varchar')
+    productName!: string;
+
+    @Column('text')
+    content!: string;
+
+    @Column('simple-json')
+    context!: BitranContext;
+
+    @Column('varchar', { nullable: true })
+    title?: string;
+}

package/server/plugin/db/reset.ts

@@ -0,0 +1,12 @@
+import { ERUDIT_SERVER } from '@server/global';
+
+export async function resetDatabase() {
+    const db = ERUDIT_SERVER.DB;
+
+    if (!db) {
+        return;
+    }
+
+    await db.dropDatabase();
+    await db.synchronize(true);
+}

package/server/plugin/db/setup.ts

@@ -1,34 +1,49 @@
-import { DataSource } from 'typeorm';
-
-import { PROJECT_DIR } from '#erudit/globalPaths';
-import { ERUDIT_SERVER } from '@server/global';
-
-// Database Entities
-import { DbContributor } from './entities/Contributor';
-import { DbBook } from './entities/Book';
-import { DbContent } from './entities/Content';
-import { DbContribution } from './entities/Contribution';
-import { DbGroup } from './entities/Group';
-import { DbHash } from './entities/Hash';
-import { DbTopic } from './entities/Topic';
-import { DbUnique } from './entities/Unique';
-
-export async function setupDatabase() {
-    ERUDIT_SERVER.DB = new DataSource({
-        type: 'sqlite',
-        database: PROJECT_DIR + '/.erudit/data.sqlite',
-        synchronize: true,
-        entities: [
-            DbBook,
-            DbContent,
-            DbContribution,
-            DbContributor,
-            DbGroup,
-            DbHash,
-            DbTopic,
-            DbUnique,
-        ],
-    });
-
-    await ERUDIT_SERVER.DB.initialize();
-}
+import { rmSync } from 'node:fs';
+import { DataSource } from 'typeorm';
+
+import { PROJECT_DIR } from '#erudit/globalPaths';
+import { ERUDIT_SERVER } from '@server/global';
+import { logger } from '@server/logger';
+
+// Database Entities
+import { DbContributor } from './entities/Contributor';
+import { DbBook } from './entities/Book';
+import { DbContent } from './entities/Content';
+import { DbContribution } from './entities/Contribution';
+import { DbGroup } from './entities/Group';
+import { DbHash } from './entities/Hash';
+import { DbTopic } from './entities/Topic';
+import { DbUnique } from './entities/Unique';
+import { DbFile } from './entities/File';
+
+export async function setupDatabase() {
+    rmSync(PROJECT_DIR + '/.erudit/data.sqlite', { force: true });
+
+    ERUDIT_SERVER.DB = new DataSource({
+        type: 'sqlite',
+        enableWAL: true,
+        database: PROJECT_DIR + '/.erudit/data.sqlite',
+        synchronize: true,
+        dropSchema: true,
+        entities: [
+            DbBook,
+            DbContent,
+            DbContribution,
+            DbContributor,
+            DbGroup,
+            DbHash,
+            DbTopic,
+            DbUnique,
+            DbFile,
+        ],
+    });
+
+    try {
+        // Wait before creating connection in case fast server restarts
+        // Otherwise, it may crash the whole Node process
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        await ERUDIT_SERVER.DB.initialize();
+    } catch (error) {
+        logger.error('Error creating database connection:', error);
+    }
+}

package/server/plugin/global.ts

@@ -1,18 +1,18 @@
-import type { DataSource } from 'typeorm';
-import type { EruditConfig } from 'erudit-cog/schema';
-
-import type { EruditPhrases } from '@shared/types/language';
-import type { NavNode, RootNavNode } from '@server/nav/node';
-import type { EruditBitranConfig } from '@erudit/globals/bitran';
-
-interface EruditServer {
-    BUILD_PROMISE: Promise<void>;
-    CONFIG: Partial<EruditConfig>;
-    LANGUAGE: { phrases: EruditPhrases; functions: Record<string, Function> };
-    DB: DataSource;
-    NAV?: RootNavNode;
-    NAV_BOOKS?: Record<string, NavNode>;
-    BITRAN_CONFIG?: Partial<EruditBitranConfig>;
-}
-
-export const ERUDIT_SERVER: EruditServer = {} as any;
+import type { DataSource } from 'typeorm';
+import type { EruditConfig } from '@erudit-js/cog/schema';
+
+import type { EruditPhrases } from '@shared/types/language';
+import type { NavNode, RootNavNode } from '@server/nav/node';
+import type { ServerSponsors } from '@server/sponsor';
+
+interface EruditServer {
+    BUILD_PROMISE: Promise<void>;
+    CONFIG: Partial<EruditConfig>;
+    LANGUAGE: { phrases: EruditPhrases; functions: Record<string, Function> };
+    DB: DataSource;
+    NAV?: RootNavNode;
+    NAV_BOOKS?: Record<string, NavNode>;
+    SPONSORS?: ServerSponsors;
+}
+
+export const ERUDIT_SERVER: EruditServer = {} as any;

package/server/plugin/importer.ts

@@ -1,12 +1,16 @@
-import { createJiti } from 'jiti';
-import { ERUDIT_DIR } from '#erudit/globalPaths';
-
-const jiti = createJiti(ERUDIT_DIR, {
-    // Enable reimporting same files during process in development mode
-    fsCache: !import.meta.dev,
-    moduleCache: !import.meta.dev,
-});
-
-export async function IMPORT(...args: Parameters<typeof jiti.import>) {
-    return jiti.import(...args) as Promise<any>;
-}
+import { createJiti } from 'jiti';
+import { ERUDIT_DIR, PROJECT_DIR } from '#erudit/globalPaths';
+
+export const jiti = createJiti(ERUDIT_DIR, {
+    // Enable reimporting same files during process in development mode
+    fsCache: !import.meta.dev,
+    moduleCache: !import.meta.dev,
+    alias: {
+        '#project': PROJECT_DIR,
+        '#content': PROJECT_DIR + '/content',
+    },
+});
+
+export async function IMPORT(...args: Parameters<typeof jiti.import>) {
+    return jiti.import(...args) as Promise<any>;
+}

package/server/plugin/index.ts

@@ -1,9 +1,9 @@
-import { ERUDIT_SERVER } from './global';
-import { build } from './build/process';
-import { close } from './build/close';
-
-export default defineNitroPlugin((_nitro) => {
-    ERUDIT_SERVER.BUILD_PROMISE = build();
-    _nitro.hooks.hook('request', async () => await ERUDIT_SERVER.BUILD_PROMISE);
-    _nitro.hooks.hook('close', close);
-});
+import { ERUDIT_SERVER } from '@server/global';
+import { build } from '@server/build/process';
+import { close } from '@server/build/close';
+
+export default defineNitroPlugin((_nitro) => {
+    build();
+    _nitro.hooks.hook('request', async () => await ERUDIT_SERVER.BUILD_PROMISE);
+    _nitro.hooks.hook('close', close);
+});

package/server/plugin/logger.ts

@@ -1,23 +1,23 @@
-import chalk from 'chalk';
-import { createConsola } from 'consola';
-import { brandColorTitle } from 'erudit-cog/utils/brand';
-
-import eruditConfig from '#erudit/config';
-
-// TODO: Consola has buggy behaviour when called inside Nitro
-// @see https://github.com/nitrojs/nitro/issues/3079
-
-export const logger = createConsola({
-    defaults: {
-        //tag: brandColorTitle + ' Server',
-        message: chalk.gray(`[${brandColorTitle} Server]`),
-    },
-});
-
-export const debug = createConsola({
-    defaults: {
-        //tag: brandColorTitle + ' Server Debug',
-        message: chalk.gray(`[${brandColorTitle} Server Debug]`),
-        level: eruditConfig?.debug?.log ? 3 : -999,
-    },
-});
+import chalk from 'chalk';
+import { createConsola } from 'consola';
+import { brandColorTitle } from '@erudit-js/cog/utils/brandNode';
+
+import eruditConfig from '#erudit/config';
+
+// TODO: Consola has buggy behaviour when called inside Nitro
+// @see https://github.com/nitrojs/nitro/issues/3079
+
+export const logger = createConsola({
+    defaults: {
+        //tag: brandColorTitle + ' Server',
+        message: chalk.gray(`[${brandColorTitle} Server]`),
+    },
+});
+
+export const debug = createConsola({
+    defaults: {
+        //tag: brandColorTitle + ' Server Debug',
+        message: chalk.gray(`[${brandColorTitle} Server Debug]`),
+        level: eruditConfig?.debug?.log ? 3 : -999,
+    },
+});

package/server/plugin/nav/node.ts

@@ -1,26 +1,27 @@
-import type { ContentType } from 'erudit-cog/schema';
-
-export interface NavNode {
-    type: ContentType;
-    path: string;
-    id: string;
-    fullId: string;
-    skip: boolean;
-    children?: NavNode[];
-    parent?: NavNode | RootNavNode;
-}
-
-export interface RootNavNode {
-    type: '#root';
-    children?: NavNode[];
-}
-
-export function isRootNode(node: NavNode | RootNavNode) {
-    return node?.type === '#root';
-}
-
-export function createRootNode(): RootNavNode {
-    return {
-        type: '#root',
-    };
-}
+import type { ContentType } from '@erudit-js/cog/schema';
+
+export interface NavNode {
+    type: ContentType;
+    fsPath: string;
+    idPart: string;
+    shortId: string;
+    fullId: string;
+    skip: boolean;
+    children?: NavNode[];
+    parent?: NavNode | RootNavNode;
+}
+
+export interface RootNavNode {
+    type: '#root';
+    children?: NavNode[];
+}
+
+export function isRootNode(node: NavNode | RootNavNode) {
+    return node?.type === '#root';
+}
+
+export function createRootNode(): RootNavNode {
+    return {
+        type: '#root',
+    };
+}