erudit 4.0.0-dev.5 → 4.0.1

package/server/erudit/content/nav/front.ts

@@ -1,125 +1,125 @@
-import { eq } from 'drizzle-orm';
-
-import type { ContentNavNode } from './types';
-
-export async function getGlobalFrontContentNav(): Promise<FrontGlobalContentNav> {
-  const bookShortIds = Array.from(ERUDIT.contentNav.id2Books.values()).map(
-    (b) => b.shortId,
-  );
-
-  const navItems = await Promise.all(
-    Array.from(ERUDIT.contentNav.id2Root.values()).map(
-      async (navNode) => await createFrontContentNavItem(navNode, true),
-    ),
-  );
-
-  return {
-    bookShortIds,
-    frontNavItems: navItems.filter((item) => item !== undefined),
-  };
-}
-
-export async function getBookFrontContentNav(
-  bookNavNode: ContentNavNode,
-): Promise<FrontContentNavBook> {
-  if (bookNavNode.type !== 'book') {
-    throw createError({
-      status: 400,
-      message: `Provided nav node "${bookNavNode.fullId}" is not a book!`,
-    });
-  }
-
-  return (await createFrontContentNavItem(
-    bookNavNode,
-    false,
-    true, // include empty book when directly requesting book nav
-  )) as FrontContentNavBook;
-}
-
-async function createFrontContentNavItem(
-  navNode: ContentNavNode,
-  isGlobal: boolean,
-  includeIfEmpty = false,
-): Promise<FrontContentNavItem | undefined> {
-  const dbContentItem = (await ERUDIT.db.query.content.findFirst({
-    columns: {
-      title: true,
-      navTitle: true,
-      flags: true,
-      hidden: true,
-    },
-    where: eq(ERUDIT.db.schema.content.fullId, navNode.fullId),
-  }))!;
-
-  if (ERUDIT.config.public.mode === 'static' && dbContentItem.hidden) {
-    if (navNode.type === 'book') {
-      if (isGlobal) {
-        // We can hide book in global nav.
-        return undefined;
-      } else {
-        // But we should show the book if user is already inside it.
-      }
-    } else {
-      return undefined;
-    }
-  }
-
-  const baseItem: FrontContentNavItemBase = {
-    shortId: navNode.shortId,
-    title: dbContentItem.navTitle || dbContentItem.title,
-    flags: dbContentItem.flags || {},
-    link: await ERUDIT.repository.content.link(navNode.fullId),
-  };
-
-  async function processChildren() {
-    const children = await Promise.all(
-      (navNode.children || []).map(
-        async (childNavNode) =>
-          await createFrontContentNavItem(childNavNode, isGlobal),
-      ),
-    );
-    return children.filter((c): c is FrontContentNavItem => c !== undefined);
-  }
-
-  switch (navNode.type) {
-    case 'topic':
-      return {
-        type: 'topic',
-        ...baseItem,
-      };
-    case 'page':
-      return {
-        type: 'page',
-        ...baseItem,
-      };
-    case 'group': {
-      const dbGroup = (await ERUDIT.db.query.groups.findFirst({
-        columns: { separator: true },
-        where: eq(ERUDIT.db.schema.groups.fullId, navNode.fullId),
-      }))!;
-      const children = await processChildren();
-      if (children.length === 0 && !includeIfEmpty) {
-        return undefined;
-      }
-      return {
-        type: 'group',
-        separator: dbGroup.separator,
-        ...baseItem,
-        children,
-      };
-    }
-    case 'book': {
-      const children = await processChildren();
-      // In global nav we suppress empty books; when directly loading book (includeIfEmpty)
-      // we still return it so consumer can show the book shell.
-      if (children.length === 0 && !includeIfEmpty) {
-        return undefined;
-      }
-      return {
-        type: 'book',
-        ...baseItem,
-        children: isGlobal ? [] : children,
-      };
-    }
-  }
-}
+import { eq } from 'drizzle-orm';
+
+import type { ContentNavNode } from './types';
+
+export async function getGlobalFrontContentNav(): Promise<FrontGlobalContentNav> {
+  const bookShortIds = Array.from(ERUDIT.contentNav.id2Books.values()).map(
+    (b) => b.shortId,
+  );
+
+  const navItems = await Promise.all(
+    Array.from(ERUDIT.contentNav.id2Root.values()).map(
+      async (navNode) => await createFrontContentNavItem(navNode, true),
+    ),
+  );
+
+  return {
+    bookShortIds,
+    frontNavItems: navItems.filter((item) => item !== undefined),
+  };
+}
+
+export async function getBookFrontContentNav(
+  bookNavNode: ContentNavNode,
+): Promise<FrontContentNavBook> {
+  if (bookNavNode.type !== 'book') {
+    throw createError({
+      status: 400,
+      message: `Provided nav node "${bookNavNode.fullId}" is not a book!`,
+    });
+  }
+
+  return (await createFrontContentNavItem(
+    bookNavNode,
+    false,
+    true, // include empty book when directly requesting book nav
+  )) as FrontContentNavBook;
+}
+
+async function createFrontContentNavItem(
+  navNode: ContentNavNode,
+  isGlobal: boolean,
+  includeIfEmpty = false,
+): Promise<FrontContentNavItem | undefined> {
+  const dbContentItem = (await ERUDIT.db.query.content.findFirst({
+    columns: {
+      title: true,
+      navTitle: true,
+      flags: true,
+      hidden: true,
+    },
+    where: eq(ERUDIT.db.schema.content.fullId, navNode.fullId),
+  }))!;
+
+  if (ERUDIT.config.public.mode === 'static' && dbContentItem.hidden) {
+    if (navNode.type === 'book') {
+      if (isGlobal) {
+        // We can hide book in global nav.
+        return undefined;
+      } else {
+        // But we should show the book if user is already inside it.
+      }
+    } else {
+      return undefined;
+    }
+  }
+
+  const baseItem: FrontContentNavItemBase = {
+    shortId: navNode.shortId,
+    title: dbContentItem.navTitle || dbContentItem.title,
+    flags: dbContentItem.flags || {},
+    link: await ERUDIT.repository.content.link(navNode.fullId),
+  };
+
+  async function processChildren() {
+    const children = await Promise.all(
+      (navNode.children || []).map(
+        async (childNavNode) =>
+          await createFrontContentNavItem(childNavNode, isGlobal),
+      ),
+    );
+    return children.filter((c): c is FrontContentNavItem => c !== undefined);
+  }
+
+  switch (navNode.type) {
+    case 'topic':
+      return {
+        type: 'topic',
+        ...baseItem,
+      };
+    case 'page':
+      return {
+        type: 'page',
+        ...baseItem,
+      };
+    case 'group': {
+      const dbGroup = (await ERUDIT.db.query.groups.findFirst({
+        columns: { separator: true },
+        where: eq(ERUDIT.db.schema.groups.fullId, navNode.fullId),
+      }))!;
+      const children = await processChildren();
+      if (children.length === 0 && !includeIfEmpty) {
+        return undefined;
+      }
+      return {
+        type: 'group',
+        separator: dbGroup.separator,
+        ...baseItem,
+        children,
+      };
+    }
+    case 'book': {
+      const children = await processChildren();
+      // In global nav we suppress empty books; when directly loading book (includeIfEmpty)
+      // we still return it so consumer can show the book shell.
+      if (children.length === 0 && !includeIfEmpty) {
+        return undefined;
+      }
+      return {
+        type: 'book',
+        ...baseItem,
+        children: isGlobal ? [] : children,
+      };
+    }
+  }
+}

package/server/erudit/content/nav/repository/books.ts

@@ -1,37 +1,37 @@
-import type { ContentNavNode } from '../types';
-
-export function getBooks(): ContentNavNode[] {
-  return Array.from(ERUDIT.contentNav.id2Books.values());
-}
-
-export function getBookIds(idType: 'full' | 'short' = 'full'): string[] {
-  return getBooks().map((book) =>
-    idType === 'short' ? book.shortId : book.fullId,
-  );
-}
-
-export function getBookFor(
-  nodeOrId: ContentNavNode | string,
-): ContentNavNode | undefined {
-  const node =
-    typeof nodeOrId === 'string'
-      ? ERUDIT.contentNav.getNode(nodeOrId)
-      : nodeOrId;
-
-  if (!node) {
-    return;
-  }
-
-  const nodeFullId = node.fullId;
-  let longestMatch: ContentNavNode | undefined;
-
-  for (const book of ERUDIT.contentNav.id2Books.values()) {
-    if (nodeFullId.startsWith(book.fullId)) {
-      if (!longestMatch || book.fullId.length > longestMatch.fullId.length) {
-        longestMatch = book;
-      }
-    }
-  }
-
-  return longestMatch;
-}
+import type { ContentNavNode } from '../types';
+
+export function getBooks(): ContentNavNode[] {
+  return Array.from(ERUDIT.contentNav.id2Books.values());
+}
+
+export function getBookIds(idType: 'full' | 'short' = 'full'): string[] {
+  return getBooks().map((book) =>
+    idType === 'short' ? book.shortId : book.fullId,
+  );
+}
+
+export function getBookFor(
+  nodeOrId: ContentNavNode | string,
+): ContentNavNode | undefined {
+  const node =
+    typeof nodeOrId === 'string'
+      ? ERUDIT.contentNav.getNode(nodeOrId)
+      : nodeOrId;
+
+  if (!node) {
+    return;
+  }
+
+  const nodeFullId = node.fullId;
+  let longestMatch: ContentNavNode | undefined;
+
+  for (const book of ERUDIT.contentNav.id2Books.values()) {
+    if (nodeFullId.startsWith(book.fullId)) {
+      if (!longestMatch || book.fullId.length > longestMatch.fullId.length) {
+        longestMatch = book;
+      }
+    }
+  }
+
+  return longestMatch;
+}

package/server/erudit/content/nav/repository/get.ts

@@ -1,33 +1,33 @@
-import type { ContentNavNode } from '../types';
-
-export function getNode(fullOrShortId: string): ContentNavNode | undefined {
-  let foundNode: ContentNavNode | undefined =
-    ERUDIT.contentNav.id2Node.get(fullOrShortId);
-
-  if (foundNode) {
-    return foundNode;
-  }
-
-  const fullId = ERUDIT.contentNav.short2Full.get(fullOrShortId);
-  if (fullId) {
-    foundNode = ERUDIT.contentNav.id2Node.get(fullId);
-    if (foundNode) {
-      return foundNode;
-    }
-  }
-
-  return undefined;
-}
-
-export function getNodeOrThrow(fullOrShortId: string): ContentNavNode {
-  const foundNode = getNode(fullOrShortId);
-
-  if (!foundNode) {
-    throw createError({
-      statusCode: 404,
-      statusMessage: `Content nav node not found: "${fullOrShortId}"!`,
-    });
-  }
-
-  return foundNode;
-}
+import type { ContentNavNode } from '../types';
+
+export function getNode(fullOrShortId: string): ContentNavNode | undefined {
+  let foundNode: ContentNavNode | undefined =
+    ERUDIT.contentNav.id2Node.get(fullOrShortId);
+
+  if (foundNode) {
+    return foundNode;
+  }
+
+  const fullId = ERUDIT.contentNav.short2Full.get(fullOrShortId);
+  if (fullId) {
+    foundNode = ERUDIT.contentNav.id2Node.get(fullId);
+    if (foundNode) {
+      return foundNode;
+    }
+  }
+
+  return undefined;
+}
+
+export function getNodeOrThrow(fullOrShortId: string): ContentNavNode {
+  const foundNode = getNode(fullOrShortId);
+
+  if (!foundNode) {
+    throw createError({
+      statusCode: 404,
+      statusMessage: `Content nav node not found: "${fullOrShortId}"!`,
+    });
+  }
+
+  return foundNode;
+}

package/server/erudit/content/nav/repository/hasChildren.ts

@@ -1,5 +1,5 @@
-import type { ContentNavNode } from '../types';
-
-export function hasChildren(node: ContentNavNode): boolean {
-  return (node.children?.length ?? 0) > 0;
-}
+import type { ContentNavNode } from '../types';
+
+export function hasChildren(node: ContentNavNode): boolean {
+  return (node.children?.length ?? 0) > 0;
+}

package/server/erudit/content/nav/repository/hasNav.ts

@@ -1,3 +1,3 @@
-export function hasNav(): boolean {
-  return ERUDIT.contentNav.id2Node.size > 0;
-}
+export function hasNav(): boolean {
+  return ERUDIT.contentNav.id2Node.size > 0;
+}

package/server/erudit/content/nav/repository/hasParent.ts

@@ -1,5 +1,5 @@
-import type { ContentNavNode } from '../types';
-
-export function hasParent(node: ContentNavNode): boolean {
-  return !!node.parent;
-}
+import type { ContentNavNode } from '../types';
+
+export function hasParent(node: ContentNavNode): boolean {
+  return !!node.parent;
+}

package/server/erudit/content/nav/repository/id.ts

@@ -1,9 +1,9 @@
-export function toFullId(fullOrShortId: string) {
-  const node = ERUDIT.contentNav.getNode(fullOrShortId);
-  return node && node.fullId;
-}
-
-export function toShortId(fullOrShortId: string) {
-  const node = ERUDIT.contentNav.getNode(fullOrShortId);
-  return node && node.shortId;
-}
+export function toFullId(fullOrShortId: string) {
+  const node = ERUDIT.contentNav.getNode(fullOrShortId);
+  return node && node.fullId;
+}
+
+export function toShortId(fullOrShortId: string) {
+  const node = ERUDIT.contentNav.getNode(fullOrShortId);
+  return node && node.shortId;
+}

package/server/erudit/content/nav/repository/index.ts

@@ -1,9 +1,9 @@
-export * from './books';
-export * from './get';
-export * from './walk';
-export * from './hasChildren';
-export * from './hasParent';
-export * from './hasNav';
-export * from './id';
-export * from './previousNext';
-export * from './order';
+export * from './books';
+export * from './get';
+export * from './walk';
+export * from './hasChildren';
+export * from './hasParent';
+export * from './hasNav';
+export * from './id';
+export * from './previousNext';
+export * from './order';

package/server/erudit/content/nav/repository/order.ts

@@ -1,14 +1,14 @@
-export function orderIds(contentIds: string[]): string[] {
-  const idsSet = new Set(contentIds);
-  const orderedIds: string[] = [];
-
-  ERUDIT.contentNav.walkSync((node) => {
-    if (idsSet.has(node.fullId)) {
-      orderedIds.push(node.fullId);
-    } else if (idsSet.has(node.shortId)) {
-      orderedIds.push(node.shortId);
-    }
-  });
-
-  return orderedIds;
-}
+export function orderIds(contentIds: string[]): string[] {
+  const idsSet = new Set(contentIds);
+  const orderedIds: string[] = [];
+
+  ERUDIT.contentNav.walkSync((node) => {
+    if (idsSet.has(node.fullId)) {
+      orderedIds.push(node.fullId);
+    } else if (idsSet.has(node.shortId)) {
+      orderedIds.push(node.shortId);
+    }
+  });
+
+  return orderedIds;
+}

package/server/erudit/content/nav/repository/previousNext.ts

@@ -1,35 +1,35 @@
-import type { ContentNavNode } from '../types';
-
-export function getPreviousNext(node: ContentNavNode) {
-  const currentFullId = node.fullId;
-
-  let previous: ContentNavNode | undefined;
-  let next: ContentNavNode | undefined;
-  let currentFound = false;
-
-  for (const navNode of ERUDIT.contentNav.id2Node.values()) {
-    if (currentFound) {
-      next = navNode;
-      break;
-    }
-
-    if (navNode.fullId === currentFullId) {
-      currentFound = true;
-    } else {
-      previous = navNode;
-    }
-  }
-
-  // If current inside book then next can't point outside of book
-  if (next) {
-    const currentBook = ERUDIT.contentNav.getBookFor(node);
-    if (currentBook) {
-      const nextBook = ERUDIT.contentNav.getBookFor(next);
-      if (!nextBook || nextBook.fullId !== currentBook.fullId) {
-        next = undefined;
-      }
-    }
-  }
-
-  return { previous, next };
-}
+import type { ContentNavNode } from '../types';
+
+export function getPreviousNext(node: ContentNavNode) {
+  const currentFullId = node.fullId;
+
+  let previous: ContentNavNode | undefined;
+  let next: ContentNavNode | undefined;
+  let currentFound = false;
+
+  for (const navNode of ERUDIT.contentNav.id2Node.values()) {
+    if (currentFound) {
+      next = navNode;
+      break;
+    }
+
+    if (navNode.fullId === currentFullId) {
+      currentFound = true;
+    } else {
+      previous = navNode;
+    }
+  }
+
+  // If current inside book then next can't point outside of book
+  if (next) {
+    const currentBook = ERUDIT.contentNav.getBookFor(node);
+    if (currentBook) {
+      const nextBook = ERUDIT.contentNav.getBookFor(next);
+      if (!nextBook || nextBook.fullId !== currentBook.fullId) {
+        next = undefined;
+      }
+    }
+  }
+
+  return { previous, next };
+}