erudit 3.0.0-dev.15 → 3.0.0-dev.17

package/server/plugin/repository/frontNav.ts

@@ -1,145 +1,145 @@
-import type {
-    FrontNav,
-    FrontNavBase,
-    FrontNavBook,
-    FrontNavFolder,
-    FrontNavItem,
-    FrontNavSeparator,
-    FrontNavTopic,
-} from '@erudit/shared/frontNav';
-
-import type { NavNode, RootNavNode } from '@server/nav/node';
-import { ERUDIT_SERVER } from '@server/global';
-import { DbContent } from '@server/db/entities/Content';
-import { DbGroup } from '@server/db/entities/Group';
-
-import { getTopicPart } from './topic';
-
-export async function createGlobalFrontNav(
-    from: RootNavNode | NavNode | undefined,
-): Promise<FrontNav | []> {
-    if (!from || !from.children) return [];
-
-    return await Promise.all(
-        from.children.map((node) =>
-            toFrontNavItem({ node, level: 0, includeBookNav: true }),
-        ),
-    );
-}
-
-export async function createBookFrontNav(from: NavNode): Promise<FrontNavBook> {
-    return await toFrontNavBook({ node: from, level: 0, includeBookNav: true });
-}
-
-type ToFuncArg = {
-    node: NavNode;
-    level: number;
-    includeBookNav?: boolean;
-};
-
-async function toFrontNavItem(arg: ToFuncArg): Promise<FrontNavItem> {
-    switch (arg.node.type) {
-        case 'book':
-            return await toFrontNavBook(arg);
-        case 'topic':
-            return await toFrontNavTopic(arg);
-        case 'group':
-            const dbGroup = await ERUDIT_SERVER.DB.manager.findOne(DbGroup, {
-                select: ['type'],
-                where: { contentId: arg.node.fullId },
-            });
-
-            if (!dbGroup)
-                throw new Error(
-                    `Missing group content item "${arg.node.fullId}" when creating front nav!`,
-                );
-
-            if (dbGroup.type === 'folder') return await toFrontNavFolder(arg);
-            else return await toFrontNavSeparator(arg);
-    }
-}
-
-async function toFrontNavBook({
-    node,
-    level,
-    includeBookNav,
-}: ToFuncArg): Promise<FrontNavBook> {
-    return {
-        type: 'book',
-        children: await toFrontNavChildren({
-            node,
-            level: 0,
-            includeBookNav,
-        }),
-        ...(await toFrontNavBase({ node, level })),
-    };
-}
-
-async function toFrontNavSeparator({
-    node,
-    level,
-    includeBookNav,
-}: ToFuncArg): Promise<FrontNavSeparator> {
-    return {
-        type: 'separator',
-        children: await toFrontNavChildren({ node, level, includeBookNav }),
-        ...(await toFrontNavBase({ node, level })),
-    };
-}
-
-async function toFrontNavFolder({
-    node,
-    level,
-    includeBookNav,
-}: ToFuncArg): Promise<FrontNavFolder> {
-    return {
-        type: 'folder',
-        children: await toFrontNavChildren({
-            node,
-            level: level + 1,
-            includeBookNav,
-        }),
-        ...(await toFrontNavBase({ node, level })),
-    };
-}
-
-async function toFrontNavTopic({
-    node,
-    level,
-}: ToFuncArg): Promise<FrontNavTopic> {
-    const topicPart = await getTopicPart(node.fullId);
-    return {
-        type: 'topic',
-        part: topicPart,
-        ...(await toFrontNavBase({ node, level })),
-    };
-}
-
-async function toFrontNavBase({
-    node,
-    level,
-}: ToFuncArg): Promise<Omit<FrontNavBase, 'type'>> {
-    const dbContent = await ERUDIT_SERVER.DB.manager.findOne(DbContent, {
-        select: ['title', 'navTitle', 'flags'],
-        where: { contentId: node.fullId },
-    });
-
-    return {
-        id: node.shortId,
-        fullId: node.fullId,
-        level,
-        flags: dbContent?.flags,
-        label: dbContent?.navTitle || dbContent?.title || node.idPart,
-    };
-}
-
-async function toFrontNavChildren({ node, includeBookNav, level }: ToFuncArg) {
-    if (node.type === 'book' && !includeBookNav) return undefined;
-    if (!node.children) return undefined;
-
-    return Promise.all(
-        node.children!.map((child) =>
-            toFrontNavItem({ node: child, level, includeBookNav }),
-        ),
-    );
-}
+import type {
+    FrontNav,
+    FrontNavBase,
+    FrontNavBook,
+    FrontNavFolder,
+    FrontNavItem,
+    FrontNavSeparator,
+    FrontNavTopic,
+} from '@erudit/shared/frontNav';
+
+import type { NavNode, RootNavNode } from '@server/nav/node';
+import { ERUDIT_SERVER } from '@server/global';
+import { DbContent } from '@server/db/entities/Content';
+import { DbGroup } from '@server/db/entities/Group';
+
+import { getTopicPart } from './topic';
+
+export async function createGlobalFrontNav(
+    from: RootNavNode | NavNode | undefined,
+): Promise<FrontNav | []> {
+    if (!from || !from.children) return [];
+
+    return await Promise.all(
+        from.children.map((node) =>
+            toFrontNavItem({ node, level: 0, includeBookNav: true }),
+        ),
+    );
+}
+
+export async function createBookFrontNav(from: NavNode): Promise<FrontNavBook> {
+    return await toFrontNavBook({ node: from, level: 0, includeBookNav: true });
+}
+
+type ToFuncArg = {
+    node: NavNode;
+    level: number;
+    includeBookNav?: boolean;
+};
+
+async function toFrontNavItem(arg: ToFuncArg): Promise<FrontNavItem> {
+    switch (arg.node.type) {
+        case 'book':
+            return await toFrontNavBook(arg);
+        case 'topic':
+            return await toFrontNavTopic(arg);
+        case 'group':
+            const dbGroup = await ERUDIT_SERVER.DB.manager.findOne(DbGroup, {
+                select: ['type'],
+                where: { contentId: arg.node.fullId },
+            });
+
+            if (!dbGroup)
+                throw new Error(
+                    `Missing group content item "${arg.node.fullId}" when creating front nav!`,
+                );
+
+            if (dbGroup.type === 'folder') return await toFrontNavFolder(arg);
+            else return await toFrontNavSeparator(arg);
+    }
+}
+
+async function toFrontNavBook({
+    node,
+    level,
+    includeBookNav,
+}: ToFuncArg): Promise<FrontNavBook> {
+    return {
+        type: 'book',
+        children: await toFrontNavChildren({
+            node,
+            level: 0,
+            includeBookNav,
+        }),
+        ...(await toFrontNavBase({ node, level })),
+    };
+}
+
+async function toFrontNavSeparator({
+    node,
+    level,
+    includeBookNav,
+}: ToFuncArg): Promise<FrontNavSeparator> {
+    return {
+        type: 'separator',
+        children: await toFrontNavChildren({ node, level, includeBookNav }),
+        ...(await toFrontNavBase({ node, level })),
+    };
+}
+
+async function toFrontNavFolder({
+    node,
+    level,
+    includeBookNav,
+}: ToFuncArg): Promise<FrontNavFolder> {
+    return {
+        type: 'folder',
+        children: await toFrontNavChildren({
+            node,
+            level: level + 1,
+            includeBookNav,
+        }),
+        ...(await toFrontNavBase({ node, level })),
+    };
+}
+
+async function toFrontNavTopic({
+    node,
+    level,
+}: ToFuncArg): Promise<FrontNavTopic> {
+    const topicPart = await getTopicPart(node.fullId);
+    return {
+        type: 'topic',
+        part: topicPart,
+        ...(await toFrontNavBase({ node, level })),
+    };
+}
+
+async function toFrontNavBase({
+    node,
+    level,
+}: ToFuncArg): Promise<Omit<FrontNavBase, 'type'>> {
+    const dbContent = await ERUDIT_SERVER.DB.manager.findOne(DbContent, {
+        select: ['title', 'navTitle', 'flags'],
+        where: { contentId: node.fullId },
+    });
+
+    return {
+        id: node.shortId,
+        fullId: node.fullId,
+        level,
+        flags: dbContent?.flags,
+        label: dbContent?.navTitle || dbContent?.title || node.idPart,
+    };
+}
+
+async function toFrontNavChildren({ node, includeBookNav, level }: ToFuncArg) {
+    if (node.type === 'book' && !includeBookNav) return undefined;
+    if (!node.children) return undefined;
+
+    return Promise.all(
+        node.children!.map((child) =>
+            toFrontNavItem({ node: child, level, includeBookNav }),
+        ),
+    );
+}

package/server/plugin/repository/topic.ts

@@ -1,35 +1,35 @@
-import type { TopicPart } from '@erudit-js/cog/schema';
-
-import { ERUDIT_SERVER } from '@server/global';
-import { DbTopic } from '@server/db/entities/Topic';
-import { getShortContentId } from '@server/repository/contentId';
-
-import type { TopicPartLinks } from '@shared/content/data/type/topic';
-import { createTopicPartLink } from '@shared/link';
-
-export async function getTopicParts(contentId: string) {
-    const dbTopic = await ERUDIT_SERVER.DB.manager.findOne(DbTopic, {
-        select: ['parts'],
-        where: { contentId },
-    });
-
-    if (!dbTopic) throw new Error(`Missing topic "${contentId}".`);
-
-    return dbTopic.parts;
-}
-
-export async function getTopicPart(contentId: string): Promise<TopicPart> {
-    const topicParts = await getTopicParts(contentId);
-    return topicParts.shift()!;
-}
-
-export async function getTopicPartsLinks(topicId: string) {
-    const existingTopicParts = await getTopicParts(topicId);
-    const shortTopicId = await getShortContentId(topicId);
-    const links: TopicPartLinks = {};
-
-    for (const topicPart of existingTopicParts)
-        links[topicPart] = createTopicPartLink(topicPart, shortTopicId);
-
-    return links;
-}
+import type { TopicPart } from '@erudit-js/cog/schema';
+
+import { ERUDIT_SERVER } from '@server/global';
+import { DbTopic } from '@server/db/entities/Topic';
+import { getShortContentId } from '@server/repository/contentId';
+
+import type { TopicPartLinks } from '@shared/content/data/type/topic';
+import { createTopicPartLink } from '@shared/link';
+
+export async function getTopicParts(contentId: string) {
+    const dbTopic = await ERUDIT_SERVER.DB.manager.findOne(DbTopic, {
+        select: ['parts'],
+        where: { contentId },
+    });
+
+    if (!dbTopic) throw new Error(`Missing topic "${contentId}".`);
+
+    return dbTopic.parts;
+}
+
+export async function getTopicPart(contentId: string): Promise<TopicPart> {
+    const topicParts = await getTopicParts(contentId);
+    return topicParts.shift()!;
+}
+
+export async function getTopicPartsLinks(topicId: string) {
+    const existingTopicParts = await getTopicParts(topicId);
+    const shortTopicId = await getShortContentId(topicId);
+    const links: TopicPartLinks = {};
+
+    for (const topicPart of existingTopicParts)
+        links[topicPart] = createTopicPartLink(topicPart, shortTopicId);
+
+    return links;
+}

package/server/tsconfig.json

@@ -1,9 +1,9 @@
-{
-    "extends": "../../../playground/.erudit/nuxt/.nuxt/tsconfig.server.json",
-    "compilerOptions": {
-        "verbatimModuleSyntax": true,
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true
-    },
-    "exclude": ["../module/**/*", "../globalPath.ts"]
-}
+{
+    "extends": "../../../playground/.erudit/nuxt/.nuxt/tsconfig.server.json",
+    "compilerOptions": {
+        "verbatimModuleSyntax": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true
+    },
+    "exclude": ["../module/**/*", "../globalPath.ts"]
+}

package/shared/aside/minor.ts

@@ -1,51 +1,51 @@
-import type { BitranLocation } from '@erudit-js/cog/schema';
-
-import type { Toc } from '../bitran/toc';
-import type { PreviousNextItem } from '../content/previousNext';
-import type { ContentContributor } from '../contributor';
-
-interface AsideMinorBase {
-    type: AsideMinorType;
-}
-
-export type AsideMinorType =
-    | 'topic'
-    | 'group'
-    | 'book'
-    | 'contributor'
-    | 'news';
-
-export interface AsideMinorTopic extends AsideMinorBase {
-    type: 'topic';
-    topicId: string;
-    location: BitranLocation;
-    nav: Partial<{
-        previous: PreviousNextItem;
-        next: PreviousNextItem;
-        article: string;
-        summary: string;
-        practice: string;
-    }>;
-    toc: Toc;
-    contributors?: ContentContributor[];
-    // todos: TodoItem[];
-}
-
-export interface AsideMinorContent extends AsideMinorBase {
-    type: 'group' | 'book';
-    contentId: string;
-    nav: Partial<{
-        previous: PreviousNextItem;
-        next: PreviousNextItem;
-    }>;
-    contributors?: ContentContributor[];
-}
-
-export interface AsideMinorNews extends AsideMinorBase {
-    type: 'news';
-}
-
-export type AsideMinorData =
-    | AsideMinorTopic
-    | AsideMinorContent
-    | AsideMinorNews;
+import type { BitranLocation } from '@erudit-js/cog/schema';
+
+import type { Toc } from '../bitran/toc';
+import type { PreviousNextItem } from '../content/previousNext';
+import type { ContentContributor } from '../contributor';
+
+interface AsideMinorBase {
+    type: AsideMinorType;
+}
+
+export type AsideMinorType =
+    | 'topic'
+    | 'group'
+    | 'book'
+    | 'contributor'
+    | 'news';
+
+export interface AsideMinorTopic extends AsideMinorBase {
+    type: 'topic';
+    topicId: string;
+    location: BitranLocation;
+    nav: Partial<{
+        previous: PreviousNextItem;
+        next: PreviousNextItem;
+        article: string;
+        summary: string;
+        practice: string;
+    }>;
+    toc: Toc;
+    contributors?: ContentContributor[];
+    // todos: TodoItem[];
+}
+
+export interface AsideMinorContent extends AsideMinorBase {
+    type: 'group' | 'book';
+    contentId: string;
+    nav: Partial<{
+        previous: PreviousNextItem;
+        next: PreviousNextItem;
+    }>;
+    contributors?: ContentContributor[];
+}
+
+export interface AsideMinorNews extends AsideMinorBase {
+    type: 'news';
+}
+
+export type AsideMinorData =
+    | AsideMinorTopic
+    | AsideMinorContent
+    | AsideMinorNews;

package/shared/asset.ts

@@ -1,22 +1,22 @@
-import {
-    PUBLIC_CONTENT_ASSET,
-    PUBLIC_CONTRIBUTOR_ASSET,
-    PUBLIC_ERUDIT_ASSET,
-    PUBLIC_USER_ASSET,
-} from '@erudit/const';
-
-export function eruditAsset(path: string) {
-    return PUBLIC_ERUDIT_ASSET + path;
-}
-
-export function contributorAsset(path: string) {
-    return PUBLIC_CONTRIBUTOR_ASSET + path;
-}
-
-export function contentAsset(path: string) {
-    return PUBLIC_CONTENT_ASSET + path;
-}
-
-export function publicAsset(path: string) {
-    return PUBLIC_USER_ASSET + path;
-}
+import {
+    PUBLIC_CONTENT_ASSET,
+    PUBLIC_CONTRIBUTOR_ASSET,
+    PUBLIC_ERUDIT_ASSET,
+    PUBLIC_USER_ASSET,
+} from '@erudit/const';
+
+export function eruditAsset(path: string) {
+    return PUBLIC_ERUDIT_ASSET + path;
+}
+
+export function contributorAsset(path: string) {
+    return PUBLIC_CONTRIBUTOR_ASSET + path;
+}
+
+export function contentAsset(path: string) {
+    return PUBLIC_CONTENT_ASSET + path;
+}
+
+export function publicAsset(path: string) {
+    return PUBLIC_USER_ASSET + path;
+}

package/shared/bitran/contentId.ts

@@ -1,56 +1,56 @@
-import { detectContentBookId } from '../content/bookId';
-
-export function toAbsoluteContentPath(
-    contentPath: string,
-    contextPath: string,
-    bookIds?: string[],
-) {
-    const unresolvedPath = (() => {
-        if (contentPath.startsWith('/')) {
-            return contentPath;
-        }
-
-        if (contentPath.startsWith('~/')) {
-            const restPath = contentPath.substring(2);
-            const bookId = detectContentBookId(contextPath, bookIds ?? []);
-
-            if (bookId) {
-                return bookId + '/' + restPath;
-            }
-
-            // Not in any book, convert to absolute path
-            return '/' + restPath;
-        }
-
-        return contextPath + '/' + contentPath;
-    })();
-
-    return resolveContentPath(unresolvedPath);
-}
-
-export function resolveContentPath(toResolvePath: string) {
-    const reverseParts = toResolvePath.split('/').reverse();
-    const resolvedParts: string[] = [];
-
-    let skipCounter = 0;
-
-    for (let i = 0; i < reverseParts.length; i++) {
-        const part = reverseParts[i];
-
-        if (part === '..') {
-            skipCounter++;
-            continue;
-        }
-
-        if (skipCounter) {
-            skipCounter--;
-            continue;
-        }
-
-        if (part && part !== '.') {
-            resolvedParts.unshift(part);
-        }
-    }
-
-    return resolvedParts.join('/');
-}
+import { detectContentBookId } from '../content/bookId';
+
+export function toAbsoluteContentPath(
+    contentPath: string,
+    contextPath: string,
+    bookIds?: string[],
+) {
+    const unresolvedPath = (() => {
+        if (contentPath.startsWith('/')) {
+            return contentPath;
+        }
+
+        if (contentPath.startsWith('~/')) {
+            const restPath = contentPath.substring(2);
+            const bookId = detectContentBookId(contextPath, bookIds ?? []);
+
+            if (bookId) {
+                return bookId + '/' + restPath;
+            }
+
+            // Not in any book, convert to absolute path
+            return '/' + restPath;
+        }
+
+        return contextPath + '/' + contentPath;
+    })();
+
+    return resolveContentPath(unresolvedPath);
+}
+
+export function resolveContentPath(toResolvePath: string) {
+    const reverseParts = toResolvePath.split('/').reverse();
+    const resolvedParts: string[] = [];
+
+    let skipCounter = 0;
+
+    for (let i = 0; i < reverseParts.length; i++) {
+        const part = reverseParts[i];
+
+        if (part === '..') {
+            skipCounter++;
+            continue;
+        }
+
+        if (skipCounter) {
+            skipCounter--;
+            continue;
+        }
+
+        if (part && part !== '.') {
+            resolvedParts.unshift(part);
+        }
+    }
+
+    return resolvedParts.join('/');
+}

package/shared/bitran/stringContent.ts

@@ -1,6 +1,6 @@
-import type { RenderDataStorage } from '@bitran-js/core';
-
-export interface StringBitranContent {
-    biCode: string;
-    renderDataStorage: RenderDataStorage;
-}
+import type { RenderDataStorage } from '@bitran-js/core';
+
+export interface StringBitranContent {
+    biCode: string;
+    renderDataStorage: RenderDataStorage;
+}

package/shared/bitran/toc.ts

@@ -1,8 +1,8 @@
-export interface TocItem {
-    id: string;
-    level: number;
-    productName: string;
-    title?: string;
-}
-
-export type Toc = TocItem[];
+export interface TocItem {
+    id: string;
+    level: number;
+    productName: string;
+    title?: string;
+}
+
+export type Toc = TocItem[];