erudit 4.3.4-dev.2 → 4.3.4

package/app/components/main/MainTopicPartPage.vue

@@ -49,6 +49,9 @@ await useContentSeo({
   snippets: mainContent.snippets,
   breadcrumbs: mainContent.breadcrumbs,
   lastmod: mainContent.lastmod,
+  contributions: mainContent.contributions,
+  flags: mainContent.flags,
+  connections: mainContent.connections,
 });
 </script>
 

package/app/composables/jsonLd.ts

@@ -1,5 +1,14 @@
+import type { ContentContribution } from '@erudit-js/core/content/contributions';
+import type { ContentFlags } from '@erudit-js/core/content/flags';
+
 import type { Breadcrumbs } from '../../shared/types/breadcrumbs';
+import type { ContentConnections } from '../../shared/types/contentConnections';
 import type { ElementSnippet } from '../../shared/types/elementSnippet';
+import type { MainContentChildrenItem } from '../../shared/types/mainContent';
+
+function contentTypeToSchemaType(type: string): string {
+  return type === 'book' ? 'Book' : type === 'group' ? 'Course' : 'Article';
+}
 
 export function useJsonLd(key: string, data: Record<string, unknown>) {
   useHead({
@@ -63,18 +72,17 @@ export function useContentArticleJsonLd(args: {
   lastmod?: string;
   keyElements?: ElementSnippet[];
   breadcrumbs?: Breadcrumbs;
+  children?: MainContentChildrenItem[];
+  contributions?: ContentContribution[];
+  flags?: ContentFlags;
+  connections?: ContentConnections;
 }) {
   const withSiteUrl = useSiteUrl();
 
   const siteTitle =
     ERUDIT.config.seo?.siteTitle || ERUDIT.config.asideMajor?.siteInfo?.title;
 
-  const schemaType =
-    args.contentType === 'book'
-      ? 'Book'
-      : args.contentType === 'group'
-        ? 'Course'
-        : 'Article';
+  const schemaType = contentTypeToSchemaType(args.contentType);
 
   const data: Record<string, unknown> = {
     '@context': 'https://schema.org',
@@ -83,6 +91,7 @@ export function useContentArticleJsonLd(args: {
       ? { headline: formatText(args.title) }
       : { name: formatText(args.title) }),
     url: withSiteUrl(args.urlPath),
+    inLanguage: ERUDIT.config.language?.current || 'en',
   };
 
   if (args.description) {
@@ -111,11 +120,62 @@ export function useContentArticleJsonLd(args: {
     };
   }
 
-  if (args.keyElements && args.keyElements.length > 0) {
-    data.hasPart = args.keyElements.map((el) => ({
-      '@type': 'DefinedTerm',
-      name: formatText(el.seo?.title || el.key?.title || el.title),
-      url: withSiteUrl(el.link),
+  const keyElementTerms = args.keyElements?.length
+    ? args.keyElements.map((el) => ({
+        '@type': 'DefinedTerm',
+        name: formatText(el.seo?.title || el.key?.title || el.title),
+        url: withSiteUrl(el.link),
+      }))
+    : [];
+
+  if (keyElementTerms.length > 0) {
+    data.about = keyElementTerms;
+  }
+
+  const hasPart: Record<string, unknown>[] = [];
+
+  if (args.children?.length) {
+    for (const child of args.children) {
+      const part: Record<string, unknown> = {
+        '@type': contentTypeToSchemaType(child.type),
+        name: formatText(child.title),
+        url: withSiteUrl(child.link),
+      };
+      if (child.description) {
+        part.description = formatText(child.description);
+      }
+      hasPart.push(part);
+    }
+  }
+
+  hasPart.push(...keyElementTerms);
+
+  if (hasPart.length > 0) {
+    data.hasPart = hasPart;
+  }
+
+  if (args.contributions?.length) {
+    data.author = args.contributions.map((c) => {
+      const person: Record<string, unknown> = {
+        '@type': 'Person',
+        name: c.name || c.contributorId,
+      };
+      if (c.avatarUrl) {
+        person.image = withSiteUrl(c.avatarUrl);
+      }
+      return person;
+    });
+  }
+
+  if (args.flags?.advanced) {
+    data.educationalLevel = 'Advanced';
+  }
+
+  if (args.connections?.hardDependencies?.length) {
+    data.isBasedOn = args.connections.hardDependencies.map((dep) => ({
+      '@type': contentTypeToSchemaType(dep.contentType),
+      name: formatText(dep.title),
+      url: withSiteUrl(dep.link),
     }));
   }
 

package/app/composables/og.ts

@@ -95,6 +95,10 @@ export async function useContentSeo(args: {
   snippets?: ElementSnippet[];
   breadcrumbs?: Breadcrumbs;
   lastmod?: string;
+  children?: MainContentChildrenItem[];
+  contributions?: ContentContribution[];
+  flags?: ContentFlags;
+  connections?: ContentConnections;
 }) {
   const canUseBookTitle = ERUDIT.config.seo?.useBookSiteTitle;
 
@@ -163,6 +167,10 @@ export async function useContentSeo(args: {
     lastmod: args.lastmod,
     keyElements: args.snippets?.filter((snippet) => !!snippet.key),
     breadcrumbs: args.breadcrumbs,
+    children: args.children,
+    contributions: args.contributions,
+    flags: args.flags,
+    connections: args.connections,
   });
 
   //

package/app/pages/book/[...bookId].vue

@@ -31,6 +31,10 @@ await useContentSeo({
   seo: mainContent.seo,
   breadcrumbs: mainContent.breadcrumbs,
   lastmod: mainContent.lastmod,
+  children: mainContent.children,
+  contributions: mainContent.contributions,
+  flags: mainContent.flags,
+  connections: mainContent.connections,
 });
 </script>
 

package/app/pages/group/[...groupId].vue

@@ -33,6 +33,10 @@ await useContentSeo({
   seo: mainContent.seo,
   breadcrumbs: mainContent.breadcrumbs,
   lastmod: mainContent.lastmod,
+  children: mainContent.children,
+  contributions: mainContent.contributions,
+  flags: mainContent.flags,
+  connections: mainContent.connections,
 });
 </script>
 

package/app/pages/page/[...pageId].vue

@@ -31,6 +31,9 @@ await useContentSeo({
   snippets: mainContent.snippets,
   breadcrumbs: mainContent.breadcrumbs,
   lastmod: mainContent.lastmod,
+  contributions: mainContent.contributions,
+  flags: mainContent.flags,
+  connections: mainContent.connections,
 });
 </script>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erudit",
-  "version": "4.3.4-dev.2",
+  "version": "4.3.4",
   "type": "module",
   "description": "🤓 CMS for perfect educational sites.",
   "license": "MIT",
@@ -24,9 +24,9 @@
     }
   },
   "dependencies": {
-    "@erudit-js/cli": "4.3.4-dev.2",
-    "@erudit-js/core": "4.3.4-dev.2",
-    "@erudit-js/prose": "4.3.4-dev.2",
+    "@erudit-js/cli": "4.3.4",
+    "@erudit-js/core": "4.3.4",
+    "@erudit-js/prose": "4.3.4",
     "@floating-ui/vue": "^1.1.11",
     "@resvg/resvg-js": "^2.6.2",
     "@tailwindcss/vite": "^4.2.1",
@@ -34,7 +34,7 @@
     "chokidar": "^5.0.0",
     "consola": "^3.4.2",
     "drizzle-kit": "^0.31.10",
-    "drizzle-orm": "^0.45.1",
+    "drizzle-orm": "^0.45.2",
     "esbuild": "^0.27.4",
     "flexsearch": "^0.8.212",
     "glob": "^13.0.6",

package/server/erudit/prose/repository/finalize.ts

@@ -1,8 +1,11 @@
 import {
   fillProseStorage,
   isProseElement,
+  isRawElement,
   type ProseElement,
+  type ProseStorage,
   type ProseWithStorage,
+  type RawElement,
 } from 'tsprose';
 import { imageSchema } from '@erudit-js/prose/elements/image/core';
 import { videoSchema } from '@erudit-js/prose/elements/video/core';
@@ -17,6 +20,7 @@ import {
 } from '@erudit-js/prose/elements/link/dependency/core';
 import { problemSchema } from '@erudit-js/prose/elements/problem/problem';
 import { subProblemSchema } from '@erudit-js/prose/elements/problem/problems';
+import { problemCheckSchema } from '@erudit-js/prose/elements/problem/problemCheck';
 
 import { createImageStorage } from '../storage/image';
 import { createVideoStorage } from '../storage/video';
@@ -26,6 +30,68 @@ import { createProblemScriptStorage } from '../storage/problemScript';
 
 import { coreElements } from '#erudit/prose/global';
 
+async function createStorageForRawElement(
+  rawElement: RawElement,
+  storageKey: string,
+) {
+  switch (true) {
+    case isRawElement(rawElement, imageSchema):
+      return await createImageStorage(rawElement as any);
+    case isRawElement(rawElement, videoSchema):
+      return createVideoStorage(rawElement as any);
+    case isRawElement(rawElement, calloutSchema):
+      return createCalloutStorage(rawElement as any);
+    case isRawElement(rawElement, refSchema):
+    case isRawElement(rawElement, referenceSchema):
+    case isRawElement(rawElement, depSchema):
+    case isRawElement(rawElement, dependencySchema):
+      return await createLinkStorage(rawElement as any, storageKey);
+    case isRawElement(rawElement, problemSchema):
+    case isRawElement(rawElement, subProblemSchema):
+      return createProblemScriptStorage(rawElement as any, storageKey);
+  }
+}
+
+async function collectEnsureStorage(
+  rawElements: RawElement[],
+  storage: ProseStorage,
+) {
+  for (const rawElement of rawElements) {
+    if (rawElement.storageKey && !(rawElement.storageKey in storage)) {
+      const value = await createStorageForRawElement(
+        rawElement,
+        rawElement.storageKey,
+      );
+      if (value !== undefined) {
+        storage[rawElement.storageKey] = value;
+      }
+    }
+    if (rawElement.children) {
+      await collectEnsureStorage(rawElement.children as RawElement[], storage);
+    }
+  }
+}
+
+async function processEnsureStorage(
+  element: ProseElement,
+  storage: ProseStorage,
+) {
+  if (
+    (isProseElement(element, problemSchema) ||
+      isProseElement(element, subProblemSchema) ||
+      isProseElement(element, problemCheckSchema)) &&
+    element.data.ensureStorage
+  ) {
+    await collectEnsureStorage(element.data.ensureStorage, storage);
+    delete element.data.ensureStorage;
+  }
+  if (element.children) {
+    for (const child of element.children as ProseElement[]) {
+      await processEnsureStorage(child, storage);
+    }
+  }
+}
+
 export async function finalizeProse(
   prose: ProseElement,
 ): Promise<ProseWithStorage> {
@@ -58,6 +124,8 @@ export async function finalizeProse(
     },
   });
 
+  await processEnsureStorage(prose, storage);
+
   return {
     prose,
     storage,