erudit 4.3.3 → 4.3.4

package/app/components/main/MainBreadcrumbs.vue

@@ -1,28 +1,36 @@
 <script lang="ts" setup>
 defineProps<{ breadcrumbs: Breadcrumbs }>();
+
+const phrase = await usePhrases('breadcrumb');
 </script>
 
 <template>
-  <section
+  <nav
     v-if="breadcrumbs.length > 0"
-    class="gap-small max-micro:justify-center px-main py-main-half flex
-      flex-wrap"
+    :aria-label="phrase.breadcrumb"
+    class="px-main py-main-half"
   >
-    <EruditLink
-      v-for="(breadcrumb, i) of breadcrumbs"
-      :to="breadcrumb.link"
-      class="gap-small text-text-dimmed hocus:text-text-muted flex items-center
-        transition-[color]"
+    <ol
+      class="gap-small max-micro:justify-center m-0 flex list-none flex-wrap
+        p-0"
     >
-      <MaybeMyIcon :name="breadcrumb.icon" class="text-[1.2em]" />
-      <span>{{ formatText(breadcrumb.title) }}</span>
-      <MyIcon
-        name="chevron-right"
-        :class="{
-          'relative -left-[3px]': true,
-          'rotate-90': i === breadcrumbs.length - 1,
-        }"
-      />
-    </EruditLink>
-  </section>
+      <li v-for="(breadcrumb, i) of breadcrumbs">
+        <EruditLink
+          :to="breadcrumb.link"
+          class="gap-small text-text-dimmed hocus:text-text-muted flex
+            items-center transition-[color]"
+        >
+          <MaybeMyIcon :name="breadcrumb.icon" class="text-[1.2em]" />
+          <span>{{ formatText(breadcrumb.title) }}</span>
+          <MyIcon
+            name="chevron-right"
+            :class="{
+              'relative -left-[3px]': true,
+              'rotate-90': i === breadcrumbs.length - 1,
+            }"
+          />
+        </EruditLink>
+      </li>
+    </ol>
+  </nav>
 </template>

package/app/components/main/MainKeyLinks.vue

@@ -19,16 +19,22 @@ const phrase = await usePhrases('key_elements');
 
 <template>
   <template v-if="keyLinks">
-    <section v-if="mode === 'single'" class="px-main py-main-half">
+    <nav
+      v-if="mode === 'single'"
+      :aria-label="phrase.key_elements"
+      class="px-main py-main-half"
+    >
       <MainSubTitle :title="phrase.key_elements + ':'" />
-      <div
+      <ul
         :style="{ '--keyBg': 'var(--color-bg-aside)' }"
-        class="gap-small micro:gap-normal micro:justify-start flex flex-wrap
-          justify-center"
+        class="gap-small micro:gap-normal micro:justify-start m-0 flex list-none
+          flex-wrap justify-center p-0"
       >
-        <MainKeyLink v-for="keyLink of keyLinks" :keyLink />
-      </div>
-    </section>
+        <li v-for="keyLink of keyLinks">
+          <MainKeyLink :keyLink />
+        </li>
+      </ul>
+    </nav>
     <div
       v-else
       :style="{ '--keyBg': 'var(--color-bg-main)' }"

package/app/components/main/MainSubTitle.vue

@@ -3,9 +3,10 @@ defineProps<{ title: string }>();
 </script>
 
 <template>
-  <div
-    class="text-main-sm micro:text-left pb-main-half text-center font-semibold"
+  <h2
+    class="text-main-sm micro:text-left pb-main-half m-0 text-center
+      font-semibold"
   >
     {{ formatText(title) }}
-  </div>
+  </h2>
 </template>

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/components/main/connections/MainConnections.vue

@@ -27,11 +27,15 @@ const parentExternalsCount = computed(() => {
 </script>
 
 <template>
-  <section v-if="connections" class="px-main py-main-half">
+  <section
+    v-if="connections"
+    :aria-label="phrase.connections"
+    class="px-main py-main-half"
+  >
     <MainSubTitle :title="phrase.connections + ':'" />
-    <div
-      class="gap-small micro:gap-normal micro:justify-start flex flex-wrap
-        justify-center"
+    <ul
+      class="gap-small micro:gap-normal micro:justify-start m-0 flex list-none
+        flex-wrap justify-center p-0"
     >
       <template
         v-for="(items, type) of {
@@ -40,49 +44,52 @@ const parentExternalsCount = computed(() => {
           dependents: connections.dependents,
         }"
       >
+        <li v-if="items && items.length > 0">
+          <MainConnectionsButton
+            :type="type"
+            :count="items.length"
+            :active="currentType === type"
+            @click="
+              currentType === type
+                ? (currentType = undefined)
+                : (currentType = type)
+            "
+          />
+        </li>
+      </template>
+      <li v-if="connections.externals">
         <MainConnectionsButton
-          v-if="items && items.length > 0"
-          :type="type"
-          :count="items.length"
-          :active="currentType === type"
+          type="externals"
+          :active="currentType === 'externals'"
           @click="
-            currentType === type
+            currentType === 'externals'
               ? (currentType = undefined)
-              : (currentType = type)
+              : (currentType = 'externals')
           "
-        />
-      </template>
-      <MainConnectionsButton
-        v-if="connections.externals"
-        type="externals"
-        :active="currentType === 'externals'"
-        @click="
-          currentType === 'externals'
-            ? (currentType = undefined)
-            : (currentType = 'externals')
-        "
-      >
-        <template #after>
-          <div
-            v-if="connections.externals"
-            class="gap-small *:border-border *:pl-small flex items-center
-              font-bold *:border-l"
-          >
+        >
+          <template #after>
             <div
-              v-if="ownExternalsCount"
-              class="flex items-center gap-1 text-amber-600 dark:text-amber-400"
+              v-if="connections.externals"
+              class="gap-small *:border-border *:pl-small flex items-center
+                font-bold *:border-l"
             >
-              <MyIcon name="arrow/left" class="-scale-x-100" />
-              <span>{{ ownExternalsCount }}</span>
-            </div>
-            <div v-if="parentExternalsCount" class="flex items-center gap-1">
-              <MyIcon name="arrow/up-to-right" />
-              <span>{{ parentExternalsCount }}</span>
+              <div
+                v-if="ownExternalsCount"
+                class="flex items-center gap-1 text-amber-600
+                  dark:text-amber-400"
+              >
+                <MyIcon name="arrow/left" class="-scale-x-100" />
+                <span>{{ ownExternalsCount }}</span>
+              </div>
+              <div v-if="parentExternalsCount" class="flex items-center gap-1">
+                <MyIcon name="arrow/up-to-right" />
+                <span>{{ parentExternalsCount }}</span>
+              </div>
             </div>
-          </div>
-        </template>
-      </MainConnectionsButton>
-    </div>
+          </template>
+        </MainConnectionsButton>
+      </li>
+    </ul>
     <template v-if="currentType && connections[currentType]">
       <Deps
         v-if="currentType !== 'externals'"

package/app/components/main/contentStats/MainContentStats.vue

@@ -15,27 +15,26 @@ const phrase = await usePhrases('stats');
 <template>
   <section
     v-if="mode === 'single' && (stats || lastChangedDate)"
+    :aria-label="phrase.stats"
     class="px-main py-main-half"
   >
     <MainSubTitle :title="phrase.stats + ':'" />
-    <div
-      class="micro:justify-start gap-small micro:gap-normal flex flex-wrap
-        justify-center"
+    <ul
+      class="micro:justify-start gap-small micro:gap-normal m-0 flex list-none
+        flex-wrap justify-center p-0"
     >
-      <ItemMaterials
-        v-if="stats?.materials"
-        :count="stats.materials"
-        mode="detailed"
-      />
-      <ItemElement
-        v-if="stats?.elements"
-        v-for="(count, schemaName) of stats.elements"
-        :schemaName
-        :count
-        mode="detailed"
-      />
-      <ItemLastChanged v-if="lastChangedDate" :date="lastChangedDate" />
-    </div>
+      <li v-if="stats?.materials">
+        <ItemMaterials :count="stats.materials" mode="detailed" />
+      </li>
+      <template v-if="stats?.elements">
+        <li v-for="(count, schemaName) of stats.elements">
+          <ItemElement :schemaName :count mode="detailed" />
+        </li>
+      </template>
+      <li v-if="lastChangedDate">
+        <ItemLastChanged :date="lastChangedDate" />
+      </li>
+    </ul>
   </section>
   <div
     v-else-if="mode === 'children' && stats"

package/app/composables/favicon.ts

@@ -112,7 +112,7 @@ export function initFavicon() {
   let stopWatchingRoute: ReturnType<typeof watch> | undefined;
   onMounted(() => {
     stopWatchingRoute = watch(
-      route,
+      () => route.path,
       () => {
         clearTimeout(contentFaviconChangeTimeout);
 

package/app/composables/jsonLd.ts

@@ -1,4 +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({
@@ -60,18 +70,19 @@ export function useContentArticleJsonLd(args: {
   urlPath: string;
   contentType: string;
   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',
@@ -80,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) {
@@ -90,12 +102,82 @@ export function useContentArticleJsonLd(args: {
     data.dateModified = args.lastmod;
   }
 
-  if (siteTitle) {
+  const parentBreadcrumb =
+    args.breadcrumbs && args.breadcrumbs.length >= 1
+      ? args.breadcrumbs[args.breadcrumbs.length - 1]
+      : undefined;
+
+  if (parentBreadcrumb) {
+    data.isPartOf = {
+      '@type': 'WebPage',
+      name: formatText(parentBreadcrumb.title),
+      url: withSiteUrl(parentBreadcrumb.link),
+    };
+  } else if (siteTitle) {
     data.isPartOf = {
       '@type': 'WebSite',
       name: siteTitle,
     };
   }
 
+  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),
+    }));
+  }
+
   useJsonLd('jsonld-content', data);
 }

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;
 
@@ -161,6 +165,12 @@ export async function useContentSeo(args: {
         ? 'article'
         : args.contentTypePath.type,
     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.3",
+  "version": "4.3.4",
   "type": "module",
   "description": "🤓 CMS for perfect educational sites.",
   "license": "MIT",
@@ -24,9 +24,9 @@
     }
   },
   "dependencies": {
-    "@erudit-js/cli": "4.3.3",
-    "@erudit-js/core": "4.3.3",
-    "@erudit-js/prose": "4.3.3",
+    "@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",
@@ -43,7 +43,7 @@
     "nuxt": "4.4.2",
     "nuxt-my-icons": "1.2.2",
     "perfect-debounce": "^2.1.0",
-    "satori": "^0.25.0",
+    "satori": "^0.26.0",
     "sharp": "^0.34.5",
     "tailwindcss": "^4.2.1",
     "ts-xor": "^1.3.0",

package/server/erudit/build.ts

@@ -61,6 +61,14 @@ export async function buildServerErudit() {
 // Watcher
 //
 
+const watchedProjectDirs = [
+  'content',
+  'contributors',
+  'cameos',
+  'sponsors',
+  'news',
+] as const;
+
 export async function tryServerWatchProject() {
   if (ERUDIT.mode === 'static') {
     return;
@@ -93,39 +101,14 @@ export async function tryServerWatchProject() {
     }
   }, 300);
 
-  function isWatched(path: string) {
-    if (path.startsWith(ERUDIT.paths.project('content') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('contributors') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('cameos') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('sponsors') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('news') + '/')) {
-      return true;
-    }
-  }
-
-  const watcher = chokidar.watch(ERUDIT.paths.project(), {
-    ignoreInitial: true,
-  });
+  const watcher = chokidar.watch(
+    watchedProjectDirs.map((dir) => ERUDIT.paths.project(dir)),
+    { ignoreInitial: true },
+  );
 
   watcher.on('all', (_, path) => {
     path = sn(path);
 
-    if (!isWatched(path)) {
-      return;
-    }
-
     if (pendingRebuild) {
       return;
     }

package/server/erudit/db/repository/pushProblemScript.ts

@@ -23,8 +23,11 @@ export async function pushProblemScript(
     relativePath = problemScriptSrc;
   }
 
-  await ERUDIT.db.insert(ERUDIT.db.schema.problemScripts).values({
-    problemScriptSrc: relativePath,
-    contentFullId,
-  });
+  await ERUDIT.db
+    .insert(ERUDIT.db.schema.problemScripts)
+    .values({
+      problemScriptSrc: relativePath,
+      contentFullId,
+    })
+    .onConflictDoNothing();
 }

package/server/erudit/language/list/en.ts

@@ -46,6 +46,7 @@ export const phrases: LanguagePhrases = {
   flag_secondary: 'Additional',
   flag_secondary_description:
     'This is an optional material is for learners who want to dive deeper and gain additional knowledge and context.',
+  breadcrumb: 'Breadcrumb',
   key_elements: 'Key elements',
   stats: 'Statistics',
   connections: 'Connections',

package/server/erudit/language/list/ru.ts

@@ -47,6 +47,7 @@ export const phrases: LanguagePhrases = {
   flag_secondary: 'Дополнение',
   flag_secondary_description:
     'Это дополнительный материал для тех, кто хочет глубже погрузиться в предмет и получить дополнительные знания и контекст.',
+  breadcrumb: 'Путь',
   key_elements: 'Ключевые элементы',
   stats: 'Статистика',
   connections: 'Связи',

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,

package/shared/types/language.ts

@@ -52,6 +52,7 @@ export type LanguagePhrases = Phrases<{
   flag_advanced_description: string;
   flag_secondary: string;
   flag_secondary_description: string;
+  breadcrumb: string;
   key_elements: string;
   stats: string;
   connections: string;