erudit 3.0.0-dev.11 → 3.0.0-dev.12

package/server/plugin/nav/utils.ts

@@ -46,7 +46,7 @@ export async function getPreviousNextNav(contentId: string) {
     let finish = false;
 
     await walkNav(async (navNode) => {
-        if (navNode.id === contentId) {
+        if (navNode.fullId === contentId) {
             book = getNavBookOf(navNode);
             finish = true;
             return;
@@ -94,7 +94,7 @@ export async function getNavNode(
     let navNode: NavNode | undefined;
 
     await walkNav(async (_navNode) => {
-        if (_navNode.id === contentId) {
+        if (_navNode.fullId === contentId) {
             navNode = _navNode;
             return false;
         }
@@ -112,7 +112,7 @@ export async function getIdsUp(contentId: string): Promise<string[]> {
 
     let currentNavNode: any = startNavNode;
     while (currentNavNode?.id) {
-        ids.push(currentNavNode.id);
+        ids.push(currentNavNode.fullId);
         currentNavNode = currentNavNode.parent;
     }
 
@@ -123,7 +123,7 @@ export async function isSkipId(contentId: string) {
     let hidden = false;
 
     await walkNav(async (navNode) => {
-        if (navNode.id === contentId) {
+        if (navNode.fullId === contentId) {
             hidden = navNode.skip;
             return false;
         }

package/server/plugin/repository/content.ts

@@ -23,11 +23,12 @@ export async function getContentGenericData(
         where: { contentId },
     });
 
-    if (!dbContent)
+    if (!dbContent) {
         throw createError({
             statusCode: 404,
             message: `Content item "${contentId}" not found!`,
         });
+    }
 
     const previousNext = await getPreviousNext(contentId);
     const decoration = await getContentDecoration(contentId);
@@ -57,12 +58,12 @@ export async function getPreviousNext(contentId: string) {
     const { previousNav, nextNav } = await getPreviousNextNav(contentId);
 
     async function getItemData(navNode: NavNode): Promise<PreviousNextItem> {
-        const title = await getContentTitle(navNode.id);
+        const title = await getContentTitle(navNode.fullId);
 
         const link = await (async () => {
             if (navNode.type === 'topic')
                 return createTopicPartLink(
-                    await getTopicPart(navNode.id),
+                    await getTopicPart(navNode.fullId),
                     navNode.id,
                 );
 
@@ -166,15 +167,6 @@ export async function getContentLink(contentId: string) {
     return createTopicPartLink(topicPart, contentId);
 }
 
-export async function getFullContentId(contentId: string) {
-    const dbContent = await ERUDIT_SERVER.DB.manager.findOne(DbContent, {
-        select: ['fullId'],
-        where: { contentId },
-    });
-
-    return dbContent?.fullId;
-}
-
 export async function getContentContributors(contentId: string) {
     const contributorIds = await (async () => {
         const idHash: Record<string, true> = {};

package/server/plugin/repository/contentId.ts

@@ -0,0 +1,26 @@
+import { DbContentId } from '@server/db/entities/ContentId';
+import { ERUDIT_SERVER } from '@server/global';
+
+async function findContentId(contentId: string): Promise<DbContentId> {
+    const dbContentId = await ERUDIT_SERVER.DB.manager.findOne(DbContentId, {
+        where: [{ shortId: contentId }, { fullId: contentId }],
+    });
+
+    if (!dbContentId) {
+        throw new Error(
+            `Can't find both short or full content id: ${contentId}!`,
+        );
+    }
+
+    return dbContentId;
+}
+
+export async function getFullContentId(maybeShortId: string): Promise<string> {
+    const dbContentId = await findContentId(maybeShortId);
+    return dbContentId.fullId;
+}
+
+export async function getShortContentId(maybeFullId: string): Promise<string> {
+    const dbContentId = await findContentId(maybeFullId);
+    return dbContentId.shortId;
+}

package/server/plugin/repository/frontNav.ts

@@ -46,12 +46,12 @@ async function toFrontNavItem(arg: ToFuncArg): Promise<FrontNavItem> {
         case 'group':
             const dbGroup = await ERUDIT_SERVER.DB.manager.findOne(DbGroup, {
                 select: ['type'],
-                where: { contentId: arg.node.id },
+                where: { contentId: arg.node.fullId },
             });
 
             if (!dbGroup)
                 throw new Error(
-                    `Missing group content item "${arg.node.id}" when creating front nav!`,
+                    `Missing group content item "${arg.node.fullId}" when creating front nav!`,
                 );
 
             if (dbGroup.type === 'folder') return await toFrontNavFolder(arg);
@@ -107,7 +107,7 @@ async function toFrontNavTopic({
     node,
     level,
 }: ToFuncArg): Promise<FrontNavTopic> {
-    const topicPart = await getTopicPart(node.id);
+    const topicPart = await getTopicPart(node.fullId);
     return {
         type: 'topic',
         part: topicPart,
@@ -121,7 +121,7 @@ async function toFrontNavBase({
 }: ToFuncArg): Promise<Omit<FrontNavBase, 'type'>> {
     const dbContent = await ERUDIT_SERVER.DB.manager.findOne(DbContent, {
         select: ['title', 'navTitle', 'flags'],
-        where: { contentId: node.id },
+        where: { contentId: node.fullId },
     });
 
     return {

package/server/plugin/repository/topic.ts

@@ -2,6 +2,8 @@ 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';
 
@@ -23,10 +25,11 @@ export async function getTopicPart(contentId: string): Promise<TopicPart> {
 
 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, topicId);
+        links[topicPart] = createTopicPartLink(topicPart, shortTopicId);
 
     return links;
 }

package/shared/aside/minor.ts

@@ -17,7 +17,7 @@ export type AsideMinorType =
 
 export interface AsideMinorTopic extends AsideMinorBase {
     type: 'topic';
-    fullContentId: string;
+    topicId: string;
     location: BitranLocation;
     nav: Partial<{
         previous: PreviousNextItem;
@@ -33,7 +33,7 @@ export interface AsideMinorTopic extends AsideMinorBase {
 
 export interface AsideMinorContent extends AsideMinorBase {
     type: 'group' | 'book';
-    fullContentId: string;
+    contentId: string;
     nav: Partial<{
         previous: PreviousNextItem;
         next: PreviousNextItem;

package/shared/bitran/contentId.ts

@@ -4,6 +4,7 @@ import {
     stringifyBitranLocation,
     type BitranLocation,
 } from '@erudit-js/cog/schema';
+import { detectContentBookId } from '../content/bookId';
 
 export function toAbsoluteLocation<T extends string | BitranLocation>(
     location: T,
@@ -43,11 +44,10 @@ export function toAbsoluteContentId(
 
         if (contentId.startsWith('~/')) {
             const restPath = contentId.substring(2);
+            const bookId = detectContentBookId(contextId, bookIds ?? []);
 
-            for (const bookId of bookIds ?? []) {
-                if (contextId.startsWith(bookId)) {
-                    return bookId + '/' + restPath;
-                }
+            if (bookId) {
+                return bookId + '/' + restPath;
             }
 
             // Not in any book, convert to absolute path

package/shared/content/bookId.ts

@@ -0,0 +1,11 @@
+export function detectContentBookId(contentId: string, bookIds: string[]) {
+    let bestMatch: string | undefined = undefined;
+    for (const bookId of bookIds) {
+        if (contentId.startsWith(bookId)) {
+            if (!bestMatch || bookId.length > bestMatch.length) {
+                bestMatch = bookId;
+            }
+        }
+    }
+    return bestMatch;
+}

package/shared/frontNav.ts

@@ -8,7 +8,7 @@ export interface FrontNavBase {
     fullId: string;
     label: string;
     level: number;
-    flags?: Record<ContentFlag, boolean>;
+    flags?: Partial<Record<ContentFlag, boolean>>;
 }
 
 export interface FrontNavTopic extends FrontNavBase {