erudit 4.1.0 → 4.2.0-dev.1

package/shared/types/elementSnippet.ts

@@ -3,7 +3,7 @@ export interface ElementSnippet {
   link: string;
   title: string;
   description?: string;
-  quick?: {
+  key?: {
     title?: string;
     description?: string;
   };

package/shared/types/indexPage.ts

@@ -1,3 +1,6 @@
+import type { ContentStats } from './contentStats';
+import type { MainContentChildrenItem } from './mainContent';
+
 export interface IndexPage {
   title: string;
   short: string;

package/shared/types/language.ts

@@ -79,6 +79,7 @@ export type LanguagePhrases = Phrases<{
   no_contribution: string;
   editor: string;
   materials: string;
+  updated: string;
   x_sponsors: (count: number) => string;
   x_contributors: (count: number) => string;
   news: string;
@@ -99,89 +100,6 @@ export type LanguagePhrases = Phrases<{
   default_index_title: string;
   default_index_short: string;
   default_site_info_short: string;
-
-  // _language_title: string;
-  // _language_code: string;
-  // site_info_title: string;
-  // site_info_slogan: string;
-  // seo_index_title: string;
-  // seo_index_description: string;
-  // seo_article_description: (contentTitle: string) => string;
-  // seo_summary_description: (contentTitle: string) => string;
-  // seo_practice_description: (contentTitle: string) => string;
-  // index: string;
-  // pages: string;
-  // search: string;
-  // language: string;
-  // other: string;
-  // ads_replacer: string;
-  // theme: string;
-  // theme_system: string;
-  // theme_light: string;
-  // theme_dark: string;
-  // content: string;
-  // main_page: string;
-  // contributors: string;
-  // contributors_page_description: string;
-  // contributors_page_invite: string;
-  // become_contributor: string;
-  // contributor: string;
-  // contribution: string;
-  // contributions_explain: (count: number) => string;
-  // contributor_description: (name: string) => string;
-  // editor: string;
-  // add_translation: string;
-  // empty_nav: string;
-  // flag_dev: string;
-  // flag_dev_description: string;
-  // flag_advanced: string;
-  // flag_advanced_description: string;
-  // flag_secondary: string;
-  // flag_secondary_description: string;
-  // popover_dependencies: string;
-  // popover_dependencies_description: string;
-  // close: string;
-  // back: string;
-  // goto: string;
-  // error: string;
-  // external_link: string;
-  // external_link_warn: string;
-  // internal_link: string;
-  // internal_link_warn: string;
-  // book: string;
-  // group: string;
-  // topic: string;
-  // topics: string;
-  // article: string;
-  // summary: string;
-  // practice: string;
-  // element_id: string;
-  // preview_missing_title: string;
-  // preview_missing_explain: string;
-  // preview_missing_explain_mismatch: string;
-  // preview_hash_mismatch_title: string;
-  // preview_hash_mismatch_explain: string;
-  // current_page_hash: string;
-  // expected_page_hash: string;
-  // empty_toc: string;
-  // no_contributors: string;
-  // make_contribution: string;
-  // material_improvement: string;
-  // how_to_improve: string;
-  // edit_page: string;
-  // report_problem: string;
-  // references: string;
-  // reference_source_featured: string;
-  // references_description: string;
-  // sponsors: string;
-  // sponsors_description: string;
-  // become_sponsor: string;
-  // toc: string;
-  // mentions: (conte: number) => string;
-  // start_learning: string;
-  // x_contributors: (count: number) => string;
-  // x_sponsors: (count: number) => string;
-  // show_all: string;
 }>;
 
 //

package/shared/types/mainContent.ts

@@ -1,10 +1,16 @@
-import type { FinalizedProse } from '@jsprose/core';
+import type { ProseWithStorage } from 'tsprose';
+
+import type { ContentSeo } from '@erudit-js/core/content/seo';
 import type { ContentType } from '@erudit-js/core/content/type';
 import type { TopicPart } from '@erudit-js/core/content/topic';
 import type { ContentFlags } from '@erudit-js/core/content/flags';
 import type { ContentContribution } from '@erudit-js/core/content/contributions';
 import type { ResolvedTocItem } from '@erudit-js/prose';
-import type { ContentSeo } from '@erudit-js/core/content/seo';
+
+import type { Breadcrumbs } from './breadcrumbs';
+import type { ContentStats } from './contentStats';
+import type { ContentConnections } from './contentConnections';
+import type { ElementSnippet } from './elementSnippet';
 
 export interface MainContentBase {
   type: ContentType;
@@ -28,7 +34,7 @@ export interface MainContentChildrenItem {
   link: string;
   title: string;
   description?: string;
-  quickLinks?: ElementSnippet[];
+  keyLinks?: ElementSnippet[];
   stats?: ContentStats;
 }
 
@@ -37,7 +43,7 @@ export interface MainContentChildrenItem {
 //
 
 export type MainContentTopicPart = MainContentBase &
-  FinalizedProse & {
+  ProseWithStorage & {
     type: 'topic';
     part: TopicPart;
     parts: TopicPart[];
@@ -46,7 +52,7 @@ export type MainContentTopicPart = MainContentBase &
   };
 
 export type MainContentPage = MainContentBase &
-  FinalizedProse & {
+  ProseWithStorage & {
     type: 'page';
     snippets?: ElementSnippet[];
     toc?: ResolvedTocItem[];

package/shared/types/news.ts

@@ -1,4 +1,4 @@
-import type { FinalizedProse } from '@jsprose/core';
+import type { ProseWithStorage } from 'tsprose';
 
 export interface NewsBatch {
   items: NewsItem[];
@@ -9,5 +9,5 @@ export interface NewsBatch {
 
 export interface NewsItem {
   date: string;
-  content: FinalizedProse;
+  content: ProseWithStorage;
 }

package/shared/types/preview.ts

@@ -1,4 +1,5 @@
-import type { FinalizedProse } from '@jsprose/core';
+import type { ProseWithStorage } from 'tsprose';
+
 import type { PreviewRequest } from '@erudit-js/core/preview/request';
 import type { ContentType } from '@erudit-js/core/content/type';
 
@@ -25,4 +26,4 @@ export type PreviewContentUnique = {
   elementTitle?: string;
   schemaName: string;
   fadeOverlay?: boolean;
-} & FinalizedProse;
+} & ProseWithStorage;

package/shared/types/runtimeConfig.ts

@@ -27,6 +27,7 @@ export interface EruditPublicRuntimeConfig {
     ads: boolean;
     fakeApi: {
       repository: boolean;
+      lastChanged: boolean | string;
     };
     analytics?: boolean;
   };

package/shared/types/search.ts

@@ -1,3 +1,5 @@
+import type { LanguageCode } from './language';
+
 //
 // Commands
 //

package/shared/utils/pages.ts

@@ -15,9 +15,11 @@ export const PAGES = {
     return sn(`/group/${shortId}/`);
   },
   ['page']: (shortId: string, elementId?: string) => {
-    return sn(`/page/${shortId}/${elementId ? '#' + elementId : ''}`);
+    return sn(`/page/${shortId}/${elementId ? '?element=' + elementId : ''}`);
   },
   ['topic']: (part: TopicPart, shortId: string, elementId?: string) => {
-    return sn(`/${part}/${shortId}/${elementId ? '#' + elementId : ''}`);
+    return sn(
+      `/${part}/${shortId}/${elementId ? '?element=' + elementId : ''}`,
+    );
   },
 };

package/shared/utils/stringColor.ts

@@ -1,13 +1,23 @@
 export function stringColor(text: string) {
-  let hash = 0;
-
+  // FNV-1a — >>> 0 after every step keeps values in unsigned 32-bit space
+  let hash = 0x811c9dc5 >>> 0;
   for (let i = 0; i < text.length; i++) {
-    hash = text.charCodeAt(i) + ((hash << 5) - hash);
+    hash = (hash ^ text.charCodeAt(i)) >>> 0;
+    hash = Math.imul(hash, 0x01000193) >>> 0;
   }
 
-  const hue = hash % 360;
-  const lightColor = `hsl(${hue}, 70%, 35%)`; // Darker for white background
-  const darkColor = `hsl(${hue}, 75%, 70%)`; // Lighter for black background
+  // Wang hash finalizer — avalanche remaining bit clusters
+  hash = (hash ^ (hash >>> 16)) >>> 0;
+  hash = Math.imul(hash, 0x45d9f3b) >>> 0;
+  hash = (hash ^ (hash >>> 16)) >>> 0;
+
+  // Divide full uint32 range by 2^32 → uniform [0, 1) → full 360° hue wheel
+  const h = Math.floor((hash / 0x100000000) * 360);
+  // Use a non-overlapping slice of bits for saturation variance
+  const s = 55 + Math.floor(((hash >>> 22) / 0x400) * 20); // 55–74%
+
+  const lightColor = `hsl(${h}, 70%, 35%)`;
+  const darkColor = `hsl(${h}, 70%, 68%)`;
 
   return `light-dark(${lightColor}, ${darkColor})`;
 }

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

@@ -1,17 +0,0 @@
-import type { AnySchema, RawElement } from '@jsprose/core';
-import { resolveEruditRawElement, type ResolveStep } from '@erudit-js/prose';
-
-export async function resolveEruditProse(
-  rawElement: RawElement<AnySchema>,
-  linkable: boolean,
-  step?: ResolveStep,
-) {
-  return await resolveEruditRawElement({
-    context: {
-      language: ERUDIT.config.public.language.current,
-      linkable,
-    },
-    rawElement,
-    step,
-  });
-}

package/server/erudit/prose/transform/bundleProblemScript.ts

@@ -1,6 +0,0 @@
-export async function bundleProblemScript(problemId: string) {
-  // Создаем фейковый stdin для esbuild, в котором импортирует требуемый скрипт из файла, где он объявлен
-  // Так на выходе получим только бандл скрипта, без лишних зависимостей
-}
-
-// Функция для вызова ESBuild бандлера, чтобы собирать problem скрипты и прочее