erudit 4.2.0-dev.1 → 4.2.0

package/app/components/aside/minor/news/AsideMinorNews.vue

@@ -98,7 +98,7 @@ const phrase = await usePhrases('news', 'no_news', 'show_more');
     <div class="flex h-full w-full flex-col">
       <AsideMinorPlainHeader
         icon="bell"
-        :title="phrase!.news"
+        :title="phrase.news"
         :count="newsTotal === 0 ? undefined : newsTotal"
       />
       <section v-if="newsItems.length === 0">

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

@@ -23,7 +23,6 @@ const lastChangedSource = useLastChangedSource(() => props.contentRelativePath);
       class="micro:justify-start gap-small micro:gap-normal flex flex-wrap
         justify-center"
     >
-      <ItemLastChanged v-if="lastChangedSource" :source="lastChangedSource" />
       <ItemMaterials
         v-if="stats?.materials"
         :count="stats.materials"
@@ -36,6 +35,7 @@ const lastChangedSource = useLastChangedSource(() => props.contentRelativePath);
         :count
         mode="detailed"
       />
+      <ItemLastChanged v-if="lastChangedSource" :source="lastChangedSource" />
     </div>
   </section>
   <div

package/app/composables/phrases.ts

@@ -39,6 +39,7 @@ export function usePhrases<const T extends readonly LanguagePhraseKey[]>(
 
     const strFunctions = await $fetch<Record<string, string>>(
       '/api/language/functions',
+      { responseType: 'json' },
     );
 
     payloadLanguage.functions = strFunctions;
@@ -69,6 +70,7 @@ export function usePhrases<const T extends readonly LanguagePhraseKey[]>(
       try {
         payloadPhraseValue = await $fetch<PayloadLanguagePhraseValue>(
           `/api/language/phrase/${phraseKey}`,
+          { responseType: 'json' },
         );
 
         payloadLanguage.phrases[phraseKey] = payloadPhraseValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erudit",
-  "version": "4.2.0-dev.1",
+  "version": "4.2.0",
   "type": "module",
   "description": "🤓 CMS for perfect educational sites.",
   "license": "MIT",
@@ -24,9 +24,9 @@
     }
   },
   "dependencies": {
-    "@erudit-js/cli": "4.2.0-dev.1",
-    "@erudit-js/core": "4.2.0-dev.1",
-    "@erudit-js/prose": "4.2.0-dev.1",
+    "@erudit-js/cli": "4.2.0",
+    "@erudit-js/core": "4.2.0",
+    "@erudit-js/prose": "4.2.0",
     "unslash": "^2.0.0",
     "@floating-ui/vue": "^1.1.10",
     "tsprose": "^1.0.0",

package/server/api/problemScript/[...problemScriptPath].ts

@@ -73,12 +73,20 @@ const jsxRuntimePlugin: Plugin = {
   },
 };
 
-// Collect all tag names that are registered in globalThis
-const proseTagNames = new Set<string>(
-  Object.values(coreElements).flatMap((el: any) =>
+// Names that are available on globalThis and should not be bundled as real imports
+const globalNames = new Set<string>([
+  // JSX runtime
+  'jsx',
+  '_jsx',
+  'jsxs',
+  '_jsxs',
+  'Fragment',
+  '_Fragment',
+  // Prose tag names registered in globalThis
+  ...Object.values(coreElements).flatMap((el: any) =>
     (el.tags ?? []).map((t: any) => String(t.tagName)),
   ),
-);
+]);
 
 // Pre-transform: rewrite any import of a known globalThis tag name → const from globalThis.
 // Non-tag imports are left as real imports and bundled normally.
@@ -106,7 +114,7 @@ const proseGlobalsPlugin: Plugin = {
               continue;
             }
             const localName = m[2] ?? m[1]!;
-            if (proseTagNames.has(localName)) {
+            if (globalNames.has(localName)) {
               shimLines.push(
                 `const ${localName} = globalThis[${JSON.stringify(localName)}];`,
               );

package/server/erudit/content/global/build.ts

@@ -11,6 +11,11 @@ const contentRoot = () => ERUDIT.paths.project('content');
 
 export let builtLinkObject: Record<string, any> | null = null;
 
+/** All valid fully-qualified $CONTENT paths — content items, topic parts,
+ *  public uniques, and internal (underscore) uniques.
+ *  Used for server-side prose link validation. */
+export let builtValidPaths: Set<string> | null = null;
+
 export async function buildGlobalContent() {
   ERUDIT.log.debug.start('Building global content...');
 
@@ -22,8 +27,9 @@ export async function buildGlobalContent() {
     return;
   }
 
-  const linkObject = await buildLinkObject();
+  const { linkObject, validPaths } = await buildLinkObject();
   builtLinkObject = linkObject;
+  builtValidPaths = validPaths;
 
   const linkTypes = linkObjectToTypes(linkObject);
   writeFileSync(
@@ -120,6 +126,7 @@ ${body}
  */
 async function buildLinkObject() {
   const linkTree: any = {};
+  const validPaths = new Set<string>();
 
   await ERUDIT.contentNav.walk((navItem) => {
     // Navigate to the correct position in the tree based on the full path
@@ -161,6 +168,11 @@ ${jsdoc}
           navItem.contentRelPath,
         ),
       };
+
+      validPaths.add(navItem.fullId);
+      for (const name of getAllUniqueNames(moduleContent)) {
+        validPaths.add(`${navItem.fullId}/$${name}`);
+      }
     } else if (navItem.type === 'topic') {
       const pathToTopicFile = ERUDIT.paths.project(
         `content/${navItem.contentRelPath}/topic.ts`,
@@ -183,6 +195,8 @@ ${jsdoc}
                 `.trim(),
       };
 
+      validPaths.add(navItem.fullId);
+
       for (const part of topicParts) {
         try {
           const pathToFile = ERUDIT.paths.project(
@@ -210,6 +224,11 @@ ${jsdoc}
               navItem.contentRelPath,
             ),
           };
+
+          validPaths.add(`${navItem.fullId}/${part}`);
+          for (const name of getAllUniqueNames(partContent)) {
+            validPaths.add(`${navItem.fullId}/${part}/$${name}`);
+          }
         } catch {}
       }
     } else {
@@ -233,10 +252,12 @@ ${jsdoc}
  */
                 `.trim(),
       };
+
+      validPaths.add(navItem.fullId);
     }
   });
 
-  return linkTree;
+  return { linkObject: linkTree, validPaths };
 }
 
 function tryGetTitle(moduleContent: string) {
@@ -254,6 +275,25 @@ function jsdocLines(lines: any[]) {
     .join('\n');
 }
 
+/** Returns ALL unique names from a module — both public and internal. Used to
+ *  populate builtValidPaths for server-side prose link validation. */
+function getAllUniqueNames(moduleContent: string): string[] {
+  const uniquesMatch = moduleContent.match(/uniques:\s*\{([^}]*)\}/s);
+  if (!uniquesMatch) return [];
+
+  const names: string[] = [];
+  for (const line of uniquesMatch[1]!.split('\n')) {
+    if (line.trim().startsWith('//')) continue;
+
+    const pairMatch =
+      line.match(/\[['"](.*?)['"]\]:\s*(\w+)/) ||
+      line.match(/['"](.*?)['"]:\s*(\w+)/) ||
+      line.match(/(\w+):\s*(\w+)/);
+    if (pairMatch) names.push(pairMatch[1]!);
+  }
+  return names;
+}
+
 function tryGetUniquesObject(
   moduleContent: string,
   pathToFile: string,
@@ -278,7 +318,7 @@ function tryGetUniquesObject(
       continue;
     }
 
-    // Skip uniques starting with underscore
+    // Skip uniques starting with underscore (internal — excluded from $CONTENT types)
     if (line.trim().startsWith('_')) {
       continue;
     }

package/server/erudit/content/repository/deps.ts

@@ -230,7 +230,7 @@ async function resolveUniqueEntries(
   const results = await Promise.all(
     unique.map(async ({ contentFullId, uniqueName }) => {
       const dbUnique = await ERUDIT.db.query.contentUniques.findFirst({
-        columns: { title: true, prose: true },
+        columns: { title: true, prose: true, contentProseType: true },
         where: and(
           eq(ERUDIT.db.schema.contentUniques.contentFullId, contentFullId),
           eq(ERUDIT.db.schema.contentUniques.uniqueName, uniqueName),
@@ -239,15 +239,24 @@ async function resolveUniqueEntries(
 
       if (!dbUnique) return null;
 
-      const pageLink = await ERUDIT.repository.content.link(contentFullId);
+      const navNode = ERUDIT.contentNav.getNodeOrThrow(contentFullId);
       const schemaName = dbUnique.prose.schema.name;
 
       if (!schemaName) return null;
 
+      const link =
+        navNode.type === 'topic'
+          ? PAGES.topic(
+              dbUnique.contentProseType as any,
+              navNode.shortId,
+              dbUnique.prose.id,
+            )
+          : PAGES.page(navNode.shortId, dbUnique.prose.id);
+
       return {
         name: uniqueName,
         title: dbUnique.title ?? undefined,
-        link: `${pageLink}?element=${dbUnique.prose.id}`,
+        link,
         schemaName,
       } satisfies ContentDepUnique;
     }),

package/server/erudit/content/resolve/utils/insertContentResolved.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { sql } from 'drizzle-orm';
 import type { ContentProseType } from '@erudit-js/core/content/prose';
-import { builtLinkObject } from '../../global/build';
+import { builtValidPaths } from '../../global/build';
 import type {
   ContentLinks,
   ContentLinkUsage,
@@ -148,25 +148,11 @@ function filterTargetMap(
 }
 
 function globalContentToNavNode(globalContentPath: string) {
-  // Validate the full path (including any $unique suffix) against the link
-  // object that was built from the source files. This catches broken unique
-  // names as well as broken content paths before we ever touch the nav tree.
-  if (builtLinkObject) {
-    const parts = globalContentPath.split('/');
-    let cursor: any = builtLinkObject;
-    let valid = true;
-
-    for (const part of parts) {
-      if (!cursor || typeof cursor !== 'object' || !(part in cursor)) {
-        valid = false;
-        break;
-      }
-      cursor = cursor[part];
-    }
-
-    if (!valid) {
-      throw new Error(`Path not found in \$CONTENT: ${globalContentPath}`);
-    }
+  // Validate the full path (including any $unique suffix) against the complete
+  // set of known valid paths built from source files. This catches broken
+  // unique names and content paths before we ever touch the nav tree.
+  if (builtValidPaths && !builtValidPaths.has(globalContentPath)) {
+    throw new Error(`Path not found in \$CONTENT: ${globalContentPath}`);
   }
 
   const parts = globalContentPath.split('/');
@@ -175,8 +161,7 @@ function globalContentToNavNode(globalContentPath: string) {
     parts.pop();
   }
 
-  // Path already validated against builtLinkObject, so if the exact node
-  // isn't found the last segment must be a topic part — fall back to parent.
+  // If the exact node isn't found the last segment is a topic part — fall back to parent.
   return (
     ERUDIT.contentNav.getNode(parts.join('/')) ??
     ERUDIT.contentNav.getNodeOrThrow(parts.slice(0, -1).join('/'))