erudit 3.0.0-dev.12 → 3.0.0-dev.13

package/app/components/aside/major/panes/nav/Nav.vue

@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import type { FrontNav } from '@shared/frontNav';
+import { detectContentBookId } from '@shared/content/bookId';
+
 import {
     getAsideMajorNavPayload,
     insideNavBook,
@@ -7,8 +9,6 @@ import {
     navBookVisible,
 } from '@app/scripts/aside/major/nav';
 
-import { detectContentBookId } from '@shared/content/bookId';
-
 import NavGlobal from './NavGlobal.vue';
 import NavBook from './NavBook.vue';
 

package/app/components/aside/major/panes/nav/NavBook.vue

@@ -47,17 +47,19 @@ const pharse = await usePhrases('to_index', 'about_book');
             </section>
             <FNav :nav="book.children!" :contentId="contentRoute?.contentId">
                 <template v-slot:before>
-                    <TreeItem
-                        icon="arrow-left"
-                        :label="pharse.to_index"
-                        @click="insideNavBook = false"
-                    />
-                    <TreeItem
-                        icon="book-question"
-                        :label="pharse.about_book"
-                        :active="contentRoute?.contentId === book.id"
-                        :link="`/book/${book.id}`"
-                    />
+                    <section :class="$style.bookActions">
+                        <TreeItem
+                            icon="arrow-left"
+                            :label="pharse.to_index"
+                            @click="insideNavBook = false"
+                        />
+                        <TreeItem
+                            icon="book-question"
+                            :label="pharse.about_book"
+                            :active="contentRoute?.contentId === book.id"
+                            :link="`/book/${book.id}`"
+                        />
+                    </section>
                 </template>
             </FNav>
         </PaneContentScroll>
@@ -84,4 +86,10 @@ const pharse = await usePhrases('to_index', 'about_book');
         flex-shrink: 0;
     }
 }
+
+.bookActions {
+    border-bottom: 1px solid var(--border);
+    padding-bottom: calc(var(--gap)/2);
+    margin-bottom: calc(var(--gap)/2);
+}
 </style>

package/app/components/main/utils/ContentReferences.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ContentReferences } from '@package';
+import type { ContentReferences } from '@erudit-js/cog/schema';
 
 import ReferenceGroup from './reference/ReferenceGroup.vue';
 

package/app/components/main/utils/reference/ReferenceGroup.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ContentReferenceGroup } from '@package';
+import type { ContentReferenceGroup } from '@erudit-js/cog/schema';
 
 import ReferenceSource from './ReferenceSource.vue';
 import ReferenceItem from './ReferenceItem.vue';

package/app/components/main/utils/reference/ReferenceItem.vue

@@ -1,7 +1,9 @@
 <script lang="ts" setup>
-import type { ContentReferenceItem } from '@package';
+import type { ContentReferenceItem } from '@erudit-js/cog/schema';
 
 defineProps<{ reference: ContentReferenceItem }>();
+
+const pretty = useFormatText();
 </script>
 
 <template>
@@ -10,7 +12,7 @@ defineProps<{ reference: ContentReferenceItem }>();
         <div :class="$style.body">
             <div :class="$style.header">
                 <a :href="reference.link" target="_blank">{{
-                    reference.title
+                    pretty(reference.title)
                 }}</a>
                 <MyIcon
                     v-if="reference.link"
@@ -19,7 +21,7 @@ defineProps<{ reference: ContentReferenceItem }>();
                 />
             </div>
             <div v-if="reference.description" :class="$style.description">
-                {{ reference.description }}
+                {{ pretty(reference.description) }}
             </div>
         </div>
     </div>

package/app/components/main/utils/reference/ReferenceSource.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
+import type { ContentReferenceSource } from '@erudit-js/cog/schema';
+
 import { type MyIconName } from '#my-icons';
-import type { ContentReferenceSource } from '@package';
 
 const props = defineProps<{ source: ContentReferenceSource }>();
 
@@ -15,6 +16,7 @@ const typeIcon = computed<MyIconName>(() => {
     }
 });
 
+const pretty = useFormatText();
 const phrase = await usePhrases('reference_source_featured');
 </script>
 
@@ -26,7 +28,7 @@ const phrase = await usePhrases('reference_source_featured');
         <div :class="$style.body">
             <div :class="$style.header">
                 <MyIcon :name="typeIcon" :class="$style.headerTypeIcon" />
-                <a :href="source.link" target="_blank">{{ source.title }}</a>
+                <a :href="source.link" target="_blank">{{ pretty(source.title) }}</a>
                 <MyIcon
                     v-if="source.featured"
                     name="star"
@@ -40,10 +42,10 @@ const phrase = await usePhrases('reference_source_featured');
                 />
             </div>
             <div v-if="source.description" :class="$style.description">
-                {{ source.description }}
+                {{ pretty(source.description) }}
             </div>
             <div v-if="source.comment" :class="$style.comment">
-                {{ source.comment }}
+                {{ pretty(source.comment) }}
             </div>
         </div>
     </div>

package/app/composables/bitranContent.ts

@@ -30,7 +30,6 @@ export async function useBitranContent(
         }
 
         const contentApiRoute = `/api/bitran/content/${encodeBitranLocation(stringifyBitranLocation(location.value!))}`;
-        nuxtApp.runWithContext(() => prerenderRoutes(contentApiRoute));
 
         // @ts-ignore
         contentPromise = (async () => {

package/nuxt.config.ts

@@ -57,7 +57,16 @@ export default defineNuxtConfig({
         preset: 'github-pages',
         plugins: [eruditPath('server/plugin')],
         prerender: {
+            crawlLinks: true,
             failOnError: false,
+            concurrency: 10,
+            ignore: [
+                (path: string) => {
+                    const regexps = [/\?element=/gm, /#/gm, /\.json\?/gm];
+                    const shouldIgnore = regexps.some((re) => re.test(path));
+                    return shouldIgnore;
+                },
+            ],
         },
         output: {
             publicDir: projectPath('dist'),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.12",
+    "version": "3.0.0-dev.13",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -15,9 +15,9 @@
         "erudit": "bin/erudit.mjs"
     },
     "peerDependencies": {
-        "@erudit-js/cog": "3.0.0-dev.12",
-        "@erudit-js/cli": "3.0.0-dev.12",
-        "@erudit-js/bitran-elements": "3.0.0-dev.12"
+        "@erudit-js/cog": "3.0.0-dev.13",
+        "@erudit-js/cli": "3.0.0-dev.13",
+        "@erudit-js/bitran-elements": "3.0.0-dev.13"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.13",

package/server/api/aside/major/nav/bookIds.ts

@@ -1,5 +1,5 @@
-import { ERUDIT_SERVER } from '@server/global';
+import { getNavBookIds } from '@server/nav/utils';
 
 export default defineEventHandler(() => {
-    return Object.keys(ERUDIT_SERVER.NAV_BOOKS || {});
+    return getNavBookIds('short');
 });

package/server/plugin/bitran/elements/include.ts

@@ -14,9 +14,10 @@ import { AliasesNode } from '@erudit-js/bitran-elements/aliases/shared';
 import { createBitranTranspiler } from '@server/bitran/transpiler';
 import { ERUDIT_SERVER } from '@server/global';
 import { DbUnique } from '@server/db/entities/Unique';
-import { getNavBookIds } from '@server/nav/utils';
-
-import { toAbsoluteLocation } from '@shared/bitran/contentId';
+import {
+    resolveClientContentId,
+    serverAbsolutizeContentPath,
+} from '@server/repository/contentId';
 
 export type TraverseEnterFn = (payload: {
     _location: string;
@@ -41,16 +42,19 @@ export async function traverseInclude(
         leave?: TraverseLeaveFn;
     },
 ): Promise<BlockNode[]> {
-    const entryLocation = stringifyBitranLocation(
-        parsePartialBitranLocation(includeNode.id, context.location),
+    const rawLocation = parsePartialBitranLocation(
+        includeNode.id,
+        context.location,
     );
 
-    // Always use absolute locations as keys for travelMap to avoid infinite loop bugs
-    const absEntryLocation = toAbsoluteLocation(
-        entryLocation,
-        context.location.path!,
-        getNavBookIds(),
-    );
+    if (rawLocation.path) {
+        rawLocation.path = serverAbsolutizeContentPath(
+            rawLocation.path,
+            context.location.path!,
+        );
+    }
+
+    const absEntryLocation = stringifyBitranLocation(rawLocation);
 
     const travelMap: Record<string, string | null> = {
         [absEntryLocation]: null,
@@ -94,18 +98,21 @@ async function _traverseInclude(
     try {
         const parsedLocation = parseBitranLocation(location);
 
-        includeTargetLocation = stringifyBitranLocation(
-            parsePartialBitranLocation(
+        includeTargetLocation = (() => {
+            const _location = parsePartialBitranLocation(
                 tryReplaceAlias(includeNode.parseData.location, aliases),
                 parsedLocation,
-            ),
-        );
+            );
 
-        includeTargetLocation = toAbsoluteLocation(
-            includeTargetLocation,
-            parsedLocation.path!,
-            getNavBookIds(),
-        );
+            if (_location.path) {
+                _location.path = serverAbsolutizeContentPath(
+                    _location.path,
+                    parsedLocation.path!,
+                );
+            }
+
+            return stringifyBitranLocation(_location);
+        })();
     } catch (error) {
         travelMap[location] = includeNode.parseData.location;
         throw new Error(

package/server/plugin/build/jobs/content/generic.ts

@@ -23,7 +23,6 @@ import { IMPORT } from '@server/importer';
 import { contributorExists } from '@server/repository/contributor';
 import { DbContribution } from '@server/db/entities/Contribution';
 import { DbFile } from '@server/db/entities/File';
-import { DbContentId } from '@server/db/entities/ContentId';
 
 import { contentAsset } from '@erudit/shared/asset';
 import type { ImageData } from '@erudit/shared/image';
@@ -81,14 +80,9 @@ async function scanContentFiles() {
 
 async function addContentItem(navNode: NavNode) {
     debug.start(
-        `Adding ${stress(navNode.type)} content item ${stress(navNode.id)}...`,
+        `Adding ${stress(navNode.type)} content item ${stress(navNode.shortId)}...`,
     );
 
-    const dbContentId = new DbContentId();
-    dbContentId.fullId = navNode.fullId;
-    dbContentId.shortId = navNode.id;
-    await ERUDIT_SERVER.DB.manager.save(dbContentId);
-
     const dbContent = new DbContent();
     dbContent.contentId = navNode.fullId;
     dbContent.type = navNode.type;

package/server/plugin/build/jobs/content/parse.ts

@@ -29,7 +29,11 @@ export async function parseBitranContent(
     context.location = location;
     context.aliases = NO_ALIASES();
 
-    bitranTranspiler ||= await createBitranTranspiler();
+    bitranTranspiler ||= await createBitranTranspiler({
+        context,
+        eruditConfig: ERUDIT_SERVER.CONFIG,
+        insideInclude: false,
+    });
 
     // Tracking heading nodes to deal with them later
     const headings: HeadingNode[] = [];

package/server/plugin/build/jobs/nav.ts

@@ -93,8 +93,8 @@ async function scanChildNodes(
         const parentId = isRootNode(parent)
             ? ''
             : parent.skip
-              ? parent.id.split('/').slice(0, -1).join('/')
-              : parent.id;
+              ? parent.fullId.split('/').slice(0, -1).join('/')
+              : parent.fullId;
 
         // Regular id might not include parent id part if it is skipped
         const id = parentId ? `${parentId}/${pathParts.id}` : pathParts.id;
@@ -114,14 +114,30 @@ async function scanChildNodes(
             ? pathParts.id
             : `${parent.fullId}/${pathParts.id}`;
 
+        // Short id skips parent ids for nodes with skip=true, except current node
+        const shortId = isRootNode(parent)
+            ? pathParts.id
+            : (() => {
+                  // Traverse up, skipping parent ids where skip=true
+                  let ids: string[] = [];
+                  let p: NavNode | RootNavNode | undefined = parent;
+                  while (p && !isRootNode(p)) {
+                      if (!p.skip) ids.unshift(p.idPart);
+                      p = p.parent;
+                  }
+                  ids.push(pathParts.id);
+                  return ids.join('/');
+              })();
+
         const skip = pathParts.sep === '+';
 
         const childNode: NavNode = {
             parent,
             type: pathParts.type,
             path: nodePath,
-            id,
+            idPart: pathParts.id,
             fullId,
+            shortId,
             skip,
         };
 
@@ -200,7 +216,7 @@ function debugPrintNav(node: RootNavNode) {
         console.log(
             isRootNode(node)
                 ? chalk.dim('#root')
-                : `${'  '.repeat(indent)}${node.id.split('/').pop()} ${chalk.dim(`[${node.type}${node.skip ? ', ' + chalk.yellow('skip') : ''}]`)}`,
+                : `${'  '.repeat(indent)}${node.idPart} ${chalk.dim(`[${node.type}${node.skip ? ', ' + chalk.yellow('skip') : ''}]`)}`,
         );
 
         if (node.children)

package/server/plugin/content/context.ts

@@ -20,11 +20,11 @@ import {
 import { CONTENT_TYPE_ICON, ICON, TOPIC_PART_ICON } from '@erudit/shared/icons';
 
 export async function getContentContext(contentId: string): Promise<Context> {
-    contentId = await getFullContentId(contentId);
+    contentId = getFullContentId(contentId);
 
     const context: Context = [];
 
-    for (const _contentId of (await getIdsUp(contentId)).reverse()) {
+    for (const _contentId of getIdsUp(contentId).reverse()) {
         const dbContent = await getDbContent(_contentId);
 
         context.push({

package/server/plugin/db/setup.ts

@@ -15,7 +15,6 @@ import { DbHash } from './entities/Hash';
 import { DbTopic } from './entities/Topic';
 import { DbUnique } from './entities/Unique';
 import { DbFile } from './entities/File';
-import { DbContentId } from './entities/ContentId';
 
 export async function setupDatabase() {
     rmSync(PROJECT_DIR + '/.erudit/data.sqlite', { force: true });
@@ -28,7 +27,6 @@ export async function setupDatabase() {
         dropSchema: true,
         entities: [
             DbBook,
-            DbContentId,
             DbContent,
             DbContribution,
             DbContributor,

package/server/plugin/nav/node.ts

@@ -3,7 +3,8 @@ import type { ContentType } from '@erudit-js/cog/schema';
 export interface NavNode {
     type: ContentType;
     path: string;
-    id: string;
+    idPart: string;
+    shortId: string;
     fullId: string;
     skip: boolean;
     children?: NavNode[];

package/server/plugin/nav/utils.ts

@@ -1,5 +1,5 @@
 import { ERUDIT_SERVER } from '@server/global';
-import { isRootNode, type NavNode } from '@server/nav/node';
+import { isRootNode, type NavNode, type RootNavNode } from '@server/nav/node';
 
 export async function walkNav(
     step: (node: NavNode) => Promise<void | false>,
@@ -18,12 +18,22 @@ export async function walkNav(
 //
 //
 
-export function getNavBookIds() {
-    return Object.keys(ERUDIT_SERVER.NAV_BOOKS || {});
+export function getNavBookIds(mode: 'full' | 'short'): string[] {
+    const bookIds: string[] = [];
+
+    if (!ERUDIT_SERVER.NAV_BOOKS) {
+        return bookIds;
+    }
+
+    for (const navBook of Object.values(ERUDIT_SERVER.NAV_BOOKS)) {
+        bookIds.push(mode === 'full' ? navBook.fullId : navBook.shortId);
+    }
+
+    return bookIds;
 }
 
 export function getNavBookOf(target: string | NavNode): NavNode | undefined {
-    const id = typeof target === 'string' ? target : target.id;
+    const id = typeof target === 'string' ? target : target.fullId;
 
     if (!id || !ERUDIT_SERVER.NAV_BOOKS) return undefined;
 
@@ -88,32 +98,64 @@ export async function getPreviousNextNav(contentId: string) {
     };
 }
 
-export async function getNavNode(
-    contentId: string,
-): Promise<NavNode | undefined> {
-    let navNode: NavNode | undefined;
+/**
+ * Find navigation node by mixed content ID.
+ * It can be full ID, short ID or any combination of present and missing skipped parts.
+ */
+export function getNavNode(mixedContentId: string): NavNode {
+    const parts = mixedContentId.split('/');
+    let foundNode: NavNode | undefined;
+
+    function search(node: NavNode, partIdx: number): NavNode | undefined {
+        const targetIdPart = parts[partIdx];
+        const nodeIdPart = node.idPart;
+
+        if (nodeIdPart === targetIdPart) {
+            if (partIdx === parts.length - 1) {
+                return node;
+            }
+
+            for (const child of node.children || []) {
+                const deepResult = search(child, partIdx + 1);
+                if (deepResult) return deepResult;
+            }
+        }
 
-    await walkNav(async (_navNode) => {
-        if (_navNode.fullId === contentId) {
-            navNode = _navNode;
-            return false;
+        if (node.skip) {
+            for (const child of node.children || []) {
+                const deepResult = search(child, partIdx);
+                if (deepResult) return deepResult;
+            }
         }
-    });
 
-    return navNode;
-}
+        return undefined;
+    }
+
+    for (const child of ERUDIT_SERVER.NAV?.children || []) {
+        foundNode = search(child, 0);
+        if (foundNode) break;
+    }
 
-export async function getIdsUp(contentId: string): Promise<string[]> {
-    const startNavNode = await getNavNode(contentId);
+    if (!foundNode) {
+        throw new Error(
+            `Failed to find navigation content node for ID: ${mixedContentId}`,
+        );
+    }
 
-    if (!startNavNode) return [];
+    return foundNode;
+}
 
+export function getIdsUp(contentId: string): string[] {
     const ids: string[] = [];
+    const startNavNode = getNavNode(contentId);
+
+    if (!startNavNode) return ids;
+
+    let currentNavNode: NavNode = startNavNode;
 
-    let currentNavNode: any = startNavNode;
-    while (currentNavNode?.id) {
+    while (currentNavNode?.idPart) {
         ids.push(currentNavNode.fullId);
-        currentNavNode = currentNavNode.parent;
+        currentNavNode = currentNavNode.parent as NavNode;
     }
 
     return ids;

package/server/plugin/repository/content.ts

@@ -6,7 +6,11 @@ import { DbContent } from '@server/db/entities/Content';
 import { DbContribution } from '@server/db/entities/Contribution';
 import { getContentContext } from '@server/content/context';
 import { DbContributor } from '@server/db/entities/Contributor';
-import { getIdsUp, getNavBookIds, getPreviousNextNav } from '@server/nav/utils';
+import { getIdsUp, getPreviousNextNav } from '@server/nav/utils';
+import {
+    getShortContentId,
+    resolveClientContentId,
+} from '@server/repository/contentId';
 import { getTopicPart } from './topic';
 import type { NavNode } from '../nav/node';
 
@@ -14,7 +18,6 @@ import { createContentLink, createTopicPartLink } from '@erudit/shared/link';
 import type { PreviousNextItem } from '@erudit/shared/content/previousNext';
 import type { ContentContributor } from '@erudit/shared/contributor';
 import type { ContentGenericData } from '@shared/content/data/base';
-import { toAbsoluteContentId } from '@erudit/shared/bitran/contentId';
 
 export async function getContentGenericData(
     contentId: string,
@@ -64,10 +67,10 @@ export async function getPreviousNext(contentId: string) {
             if (navNode.type === 'topic')
                 return createTopicPartLink(
                     await getTopicPart(navNode.fullId),
-                    navNode.id,
+                    navNode.shortId,
                 );
 
-            return createContentLink(navNode.type, navNode.id);
+            return createContentLink(navNode.type, navNode.shortId);
         })();
 
         return {
@@ -126,9 +129,13 @@ export async function getContentDependencies(
     contentId: string,
     strDependencies: string[],
 ) {
-    const dependencyIds = strDependencies.map((rawDependency) =>
-        toAbsoluteContentId(rawDependency, contentId, getNavBookIds()),
-    );
+    const dependencyIds: string[] = [];
+    for (const rawDependency of strDependencies) {
+        dependencyIds.push(
+            resolveClientContentId(rawDependency, contentId, 'full'),
+        );
+    }
+
     const dependencies: Record<string, string> = {};
 
     for (const dependencyId of dependencyIds)
@@ -153,18 +160,22 @@ export async function getContentLink(contentId: string) {
         where: { contentId },
     });
 
-    if (!dbContent)
+    if (!dbContent) {
         throw createError({
             statusCode: 404,
             statusText: `Missing "${contentId}" content item!`,
         });
+    }
+
+    const shortContentId = getShortContentId(contentId);
 
-    if (dbContent.type !== 'topic')
-        return createContentLink(dbContent.type, contentId);
+    if (dbContent.type !== 'topic') {
+        return createContentLink(dbContent.type, shortContentId);
+    }
 
     const topicPart = await getTopicPart(contentId);
 
-    return createTopicPartLink(topicPart, contentId);
+    return createTopicPartLink(topicPart, shortContentId);
 }
 
 export async function getContentContributors(contentId: string) {

package/server/plugin/repository/contentId.ts

@@ -1,26 +1,40 @@
-import { DbContentId } from '@server/db/entities/ContentId';
-import { ERUDIT_SERVER } from '@server/global';
+import { getNavBookIds, getNavNode } from '@server/nav/utils';
+import { toAbsoluteContentPath } from '@shared/bitran/contentId';
 
-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}!`,
-        );
-    }
+export function getFullContentId(mixedContentId: string): string {
+    const navNode = getNavNode(mixedContentId);
+    return navNode.fullId;
+}
 
-    return dbContentId;
+export function getShortContentId(mixedContentId: string): string {
+    const navNode = getNavNode(mixedContentId);
+    return navNode.shortId;
 }
 
-export async function getFullContentId(maybeShortId: string): Promise<string> {
-    const dbContentId = await findContentId(maybeShortId);
-    return dbContentId.fullId;
+export function serverAbsolutizeContentPath(
+    relativePath: string,
+    contextPath: string,
+) {
+    const absolutePath = toAbsoluteContentPath(
+        relativePath,
+        contextPath,
+        getNavBookIds('full'),
+    );
+
+    return absolutePath;
 }
 
-export async function getShortContentId(maybeFullId: string): Promise<string> {
-    const dbContentId = await findContentId(maybeFullId);
-    return dbContentId.shortId;
+export function resolveClientContentId(
+    clientContentId: string,
+    contextContentId: string,
+    mode: 'full' | 'short',
+): string {
+    const absoluteContentId = serverAbsolutizeContentPath(
+        clientContentId,
+        contextContentId,
+    );
+
+    return mode === 'full'
+        ? getFullContentId(absoluteContentId)
+        : getShortContentId(absoluteContentId);
 }

package/server/plugin/repository/frontNav.ts

@@ -125,14 +125,11 @@ async function toFrontNavBase({
     });
 
     return {
-        id: node.id,
+        id: node.shortId,
         fullId: node.fullId,
         level,
         flags: dbContent?.flags,
-        label:
-            dbContent?.navTitle ||
-            dbContent?.title ||
-            node.id.split('/').pop()!,
+        label: dbContent?.navTitle || dbContent?.title || node.idPart,
     };
 }
 

package/shared/bitran/contentId.ts

@@ -1,50 +1,18 @@
-import {
-    isContentType,
-    parseBitranLocation,
-    stringifyBitranLocation,
-    type BitranLocation,
-} from '@erudit-js/cog/schema';
 import { detectContentBookId } from '../content/bookId';
 
-export function toAbsoluteLocation<T extends string | BitranLocation>(
-    location: T,
-    contextId: string,
-    bookIds?: string[],
-) {
-    const isStringLocation = typeof location === 'string';
-    const parsedLocation = isStringLocation
-        ? parseBitranLocation(location)
-        : (location as BitranLocation);
-
-    if (isContentType(parsedLocation.type)) {
-        parsedLocation.path = toAbsoluteContentId(
-            parsedLocation.path!,
-            contextId,
-            bookIds,
-        );
-        return (
-            isStringLocation
-                ? stringifyBitranLocation(parsedLocation)
-                : parsedLocation
-        ) as T;
-    }
-
-    return location;
-}
-
-export function toAbsoluteContentId(
-    contentId: string,
-    contextId: string,
+export function toAbsoluteContentPath(
+    contentPath: string,
+    contextPath: string,
     bookIds?: string[],
 ) {
     const unresolvedPath = (() => {
-        if (contentId.startsWith('/')) {
-            return contentId;
+        if (contentPath.startsWith('/')) {
+            return contentPath;
         }
 
-        if (contentId.startsWith('~/')) {
-            const restPath = contentId.substring(2);
-            const bookId = detectContentBookId(contextId, bookIds ?? []);
+        if (contentPath.startsWith('~/')) {
+            const restPath = contentPath.substring(2);
+            const bookId = detectContentBookId(contextPath, bookIds ?? []);
 
             if (bookId) {
                 return bookId + '/' + restPath;
@@ -54,7 +22,7 @@ export function toAbsoluteContentId(
             return '/' + restPath;
         }
 
-        return contextId + '/' + contentId;
+        return contextPath + '/' + contentPath;
     })();
 
     return resolveContentPath(unresolvedPath);

package/shared/content/bookId.ts

@@ -7,5 +7,6 @@ export function detectContentBookId(contentId: string, bookIds: string[]) {
             }
         }
     }
+
     return bestMatch;
 }

package/test/contentId.test.ts

@@ -1,5 +1,5 @@
 import {
-    toAbsoluteContentId,
+    toAbsoluteContentPath,
     resolveContentPath,
 } from '@erudit/shared/bitran/contentId';
 
@@ -54,23 +54,23 @@ describe('resolveContentPath', () => {
     });
 });
 
-describe('toAbsoluteContentId', () => {
+describe('toAbsoluteContentPath', () => {
     const bookIds = ['combinatorics', 'group/book'];
 
     it('should not use context on absolute paths', () => {
-        expect(toAbsoluteContentId('/foo/bar/../baz', 'qux/vaz', bookIds)).toBe(
-            'foo/baz',
-        );
+        expect(
+            toAbsoluteContentPath('/foo/bar/../baz', 'qux/vaz', bookIds),
+        ).toBe('foo/baz');
     });
 
     it('should fallback to absolute path if not inside book', () => {
-        expect(toAbsoluteContentId('~/foo/bar', 'unknown-book', bookIds)).toBe(
-            'foo/bar',
-        );
+        expect(
+            toAbsoluteContentPath('~/foo/bar', 'unknown-book', bookIds),
+        ).toBe('foo/bar');
     });
 
     it('should correctly handle book-relative paths', () => {
-        expect(toAbsoluteContentId('~/foo/bar', 'group/book', bookIds)).toBe(
+        expect(toAbsoluteContentPath('~/foo/bar', 'group/book', bookIds)).toBe(
             'group/book/foo/bar',
         );
     });
@@ -83,7 +83,7 @@ describe('toAbsoluteContentId', () => {
         ];
 
         for (const [contentId, context, expected] of testCases) {
-            expect(toAbsoluteContentId(contentId!, context!, bookIds)).toBe(
+            expect(toAbsoluteContentPath(contentId!, context!, bookIds)).toBe(
                 expected,
             );
         }

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

@@ -1,11 +0,0 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
-
-@Entity('contentId')
-export class DbContentId {
-    @PrimaryColumn('varchar')
-    fullId!: string;
-
-    @Column('varchar')
-    @Index({ unique: true })
-    shortId!: string;
-}