erudit 4.0.0-dev.5 → 4.0.1

package/app/components/aside/major/search/search.worker.ts

@@ -1,164 +1,164 @@
-import { Document, Encoder } from 'flexsearch';
-
-import { unzip } from '#layers/erudit/shared/utils/zip';
-import { encoderAugments } from '#layers/erudit/shared/search/encoders';
-
-const batchSize = 50;
-
-let baseUrl: string;
-let initPromise: Promise<void>;
-let initError: string | undefined;
-let latestSearchId: number = -1;
-let documentIndex: Document;
-let categoryPriorityById: Record<string, number>;
-
-let currentOrdered: (string | number)[] = [];
-let currentOffset = 0;
-
-onmessage = async (e) => {
-  const command = e.data as SearchCommand;
-  switch (command.type) {
-    case 'init':
-      baseUrl = command.baseUrl;
-      initPromise = init(command);
-      break;
-    case 'search': {
-      await initPromise;
-      trySendInitError();
-      latestSearchId = command.id;
-      currentOrdered = buildOrderedResults(command.query);
-      currentOffset = 0;
-      sendResults(command.id, batchSize);
-      break;
-    }
-    case 'more': {
-      await initPromise;
-      trySendInitError();
-      sendResults(command.id, batchSize);
-      break;
-    }
-  }
-};
-
-async function init(initCommand: SearchCommandInit) {
-  try {
-    const fetchedSearch = await fetch(
-      baseUrl + 'search.json.gz?' + initCommand.cacheId,
-    );
-    const gzipSearch = await fetchedSearch.text();
-    const textSearch = await unzip(gzipSearch);
-    const jsonSearch = JSON.parse(textSearch);
-
-    const encoder = new Encoder();
-    encoderAugments[initCommand.language as LanguageCode]?.(encoder);
-
-    documentIndex = new Document({
-      document: {
-        ...jsonSearch.documentDescriptor,
-        encoder,
-      },
-    });
-
-    categoryPriorityById = Object.create(null);
-    for (const cat of jsonSearch.categories as {
-      id: string;
-      priority: number;
-    }[]) {
-      categoryPriorityById[cat.id] = cat.priority;
-    }
-
-    for (const key in jsonSearch.export) {
-      documentIndex.import(key, jsonSearch.export[key]);
-    }
-  } catch (error) {
-    initError =
-      'Search init error: ' +
-      (error instanceof Error ? error.message : String(error));
-
-    const errorResponse: SearchResponseError = {
-      type: 'error',
-      message: initError,
-    };
-
-    postMessage(errorResponse);
-  }
-}
-
-function trySendInitError() {
-  if (initError) {
-    const errorResponse: SearchResponseError = {
-      type: 'error',
-      message: initError,
-    };
-    postMessage(errorResponse);
-  }
-}
-
-function buildOrderedResults(query: string): (string | number)[] {
-  // 1. Fast-path: ignore empty or whitespace-only queries.
-  if (!query || !query.trim()) return [];
-
-  // 2. Perform search. FlexSearch Document#search returns groups (by field/tag).
-  //    Each group contains a .result array of ids. We set a reasonably high limit
-  //    (1000) to gather enough candidates; final pagination happens later.
-  const groups = documentIndex.search(query, { limit: 1000 }) as {
-    field?: string;
-    tag?: string;
-    result: (string | number)[];
-  }[];
-
-  // 3. Use a Set to enforce uniqueness while preserving first-seen order.
-  const seen = new Set<string | number>();
-
-  // 4. Accumulate ranked entries immediately (single pass):
-  //    - id: document identifier
-  //    - priority: derived from document metadata (categoryPriority) or 0
-  //    - pos: stable position (the order we first encountered the id)
-  const ranked: { id: string | number; priority: number; pos: number }[] = [];
-  let pos = 0;
-
-  for (const group of groups) {
-    const results = group.result;
-    for (let i = 0, len = results.length; i < len; i++) {
-      const id = results[i]!;
-      if (!seen.has(id)) {
-        seen.add(id);
-        const doc: any = documentIndex.get(id);
-        if (!doc) continue;
-        ranked.push({
-          id,
-          priority: categoryPriorityById[doc?.category] ?? 0, // replaced doc.categoryPriority
-          pos: pos++, // capture discovery order for stable secondary sorting
-        });
-      }
-    }
-  }
-
-  // 5. Sort primarily by descending priority, secondarily by original discovery order
-  //    to preserve stable ordering among equally prioritized documents.
-  ranked.sort((a, b) => b.priority - a.priority || a.pos - b.pos);
-
-  // 6. Return only the ordered ids (actual documents fetched lazily during pagination).
-  return ranked.map((r) => r.id);
-}
-
-function sendResults(searchId: number, pageSize: number) {
-  if (searchId !== latestSearchId) {
-    // Drop results for any stale (outdated) search id.
-    return;
-  }
-
-  const start = currentOffset;
-  const end = start + pageSize;
-  const slice = currentOrdered.slice(start, end);
-  currentOffset = end;
-  const entries = slice.map((id) => documentIndex.get(id));
-  const hasMore = currentOffset < currentOrdered.length;
-  const resultsResponse: SearchResponseResults = {
-    type: 'results',
-    entries: entries as any,
-    hasMore,
-  };
-
-  postMessage(resultsResponse);
-}
+import { Document, Encoder } from 'flexsearch';
+
+import { unzip } from '#layers/erudit/shared/utils/zip';
+import { encoderAugments } from '#layers/erudit/shared/search/encoders';
+
+const batchSize = 50;
+
+let baseUrl: string;
+let initPromise: Promise<void>;
+let initError: string | undefined;
+let latestSearchId: number = -1;
+let documentIndex: Document;
+let categoryPriorityById: Record<string, number>;
+
+let currentOrdered: (string | number)[] = [];
+let currentOffset = 0;
+
+onmessage = async (e) => {
+  const command = e.data as SearchCommand;
+  switch (command.type) {
+    case 'init':
+      baseUrl = command.baseUrl;
+      initPromise = init(command);
+      break;
+    case 'search': {
+      await initPromise;
+      trySendInitError();
+      latestSearchId = command.id;
+      currentOrdered = buildOrderedResults(command.query);
+      currentOffset = 0;
+      sendResults(command.id, batchSize);
+      break;
+    }
+    case 'more': {
+      await initPromise;
+      trySendInitError();
+      sendResults(command.id, batchSize);
+      break;
+    }
+  }
+};
+
+async function init(initCommand: SearchCommandInit) {
+  try {
+    const fetchedSearch = await fetch(
+      baseUrl + 'search.json.gz?' + initCommand.cacheId,
+    );
+    const gzipSearch = await fetchedSearch.text();
+    const textSearch = await unzip(gzipSearch);
+    const jsonSearch = JSON.parse(textSearch);
+
+    const encoder = new Encoder();
+    encoderAugments[initCommand.language as LanguageCode]?.(encoder);
+
+    documentIndex = new Document({
+      document: {
+        ...jsonSearch.documentDescriptor,
+        encoder,
+      },
+    });
+
+    categoryPriorityById = Object.create(null);
+    for (const cat of jsonSearch.categories as {
+      id: string;
+      priority: number;
+    }[]) {
+      categoryPriorityById[cat.id] = cat.priority;
+    }
+
+    for (const key in jsonSearch.export) {
+      documentIndex.import(key, jsonSearch.export[key]);
+    }
+  } catch (error) {
+    initError =
+      'Search init error: ' +
+      (error instanceof Error ? error.message : String(error));
+
+    const errorResponse: SearchResponseError = {
+      type: 'error',
+      message: initError,
+    };
+
+    postMessage(errorResponse);
+  }
+}
+
+function trySendInitError() {
+  if (initError) {
+    const errorResponse: SearchResponseError = {
+      type: 'error',
+      message: initError,
+    };
+    postMessage(errorResponse);
+  }
+}
+
+function buildOrderedResults(query: string): (string | number)[] {
+  // 1. Fast-path: ignore empty or whitespace-only queries.
+  if (!query || !query.trim()) return [];
+
+  // 2. Perform search. FlexSearch Document#search returns groups (by field/tag).
+  //    Each group contains a .result array of ids. We set a reasonably high limit
+  //    (1000) to gather enough candidates; final pagination happens later.
+  const groups = documentIndex.search(query, { limit: 1000 }) as {
+    field?: string;
+    tag?: string;
+    result: (string | number)[];
+  }[];
+
+  // 3. Use a Set to enforce uniqueness while preserving first-seen order.
+  const seen = new Set<string | number>();
+
+  // 4. Accumulate ranked entries immediately (single pass):
+  //    - id: document identifier
+  //    - priority: derived from document metadata (categoryPriority) or 0
+  //    - pos: stable position (the order we first encountered the id)
+  const ranked: { id: string | number; priority: number; pos: number }[] = [];
+  let pos = 0;
+
+  for (const group of groups) {
+    const results = group.result;
+    for (let i = 0, len = results.length; i < len; i++) {
+      const id = results[i]!;
+      if (!seen.has(id)) {
+        seen.add(id);
+        const doc: any = documentIndex.get(id);
+        if (!doc) continue;
+        ranked.push({
+          id,
+          priority: categoryPriorityById[doc?.category] ?? 0, // replaced doc.categoryPriority
+          pos: pos++, // capture discovery order for stable secondary sorting
+        });
+      }
+    }
+  }
+
+  // 5. Sort primarily by descending priority, secondarily by original discovery order
+  //    to preserve stable ordering among equally prioritized documents.
+  ranked.sort((a, b) => b.priority - a.priority || a.pos - b.pos);
+
+  // 6. Return only the ordered ids (actual documents fetched lazily during pagination).
+  return ranked.map((r) => r.id);
+}
+
+function sendResults(searchId: number, pageSize: number) {
+  if (searchId !== latestSearchId) {
+    // Drop results for any stale (outdated) search id.
+    return;
+  }
+
+  const start = currentOffset;
+  const end = start + pageSize;
+  const slice = currentOrdered.slice(start, end);
+  currentOffset = end;
+  const entries = slice.map((id) => documentIndex.get(id));
+  const hasMore = currentOffset < currentOrdered.length;
+  const resultsResponse: SearchResponseResults = {
+    type: 'results',
+    entries: entries as any,
+    hasMore,
+  };
+
+  postMessage(resultsResponse);
+}

package/app/components/aside/major/settings/BuildTime.vue

@@ -1,25 +1,25 @@
-<script lang="ts" setup>
-const runtimeConfig = useRuntimeConfig();
-const language = ERUDIT.config.language.current;
-const buildTime = runtimeConfig.public.buildTime;
-
-const formattedBuildDate = computed(() => {
-  let date = new Date(buildTime);
-  return new Intl.DateTimeFormat(language, {
-    day: '2-digit',
-    month: 'short',
-    year: 'numeric',
-  }).format(date);
-});
-
-const phrase = await usePhrases('built');
-</script>
-
-<template>
-  <AsideListItem
-    :hoverable="false"
-    icon="box"
-    :main="phrase.built"
-    :secondary="formattedBuildDate"
-  />
-</template>
+<script lang="ts" setup>
+const runtimeConfig = useRuntimeConfig();
+const language = ERUDIT.config.language.current;
+const buildTime = runtimeConfig.public.buildTime;
+
+const formattedBuildDate = computed(() => {
+  let date = new Date(buildTime);
+  return new Intl.DateTimeFormat(language, {
+    day: '2-digit',
+    month: 'short',
+    year: 'numeric',
+  }).format(date);
+});
+
+const phrase = await usePhrases('built');
+</script>
+
+<template>
+  <AsideListItem
+    :hoverable="false"
+    icon="box"
+    :main="phrase.built"
+    :secondary="formattedBuildDate"
+  />
+</template>

package/app/components/aside/major/settings/EngineVersion.vue

@@ -1,14 +1,14 @@
-<script lang="ts" setup>
-const runtimeConfig = useRuntimeConfig();
-const phrase = await usePhrases('erudit');
-</script>
-
-<template>
-  <AsideListItem
-    icon="erudit"
-    to="https://github.com/erudit-js/erudit"
-    target="_blank"
-    :main="phrase.erudit"
-    :secondary="runtimeConfig.public.eruditVersion"
-  />
-</template>
+<script lang="ts" setup>
+const runtimeConfig = useRuntimeConfig();
+const phrase = await usePhrases('erudit');
+</script>
+
+<template>
+  <AsideListItem
+    icon="erudit"
+    to="https://github.com/erudit-js/erudit"
+    target="_blank"
+    :main="phrase.erudit"
+    :secondary="runtimeConfig.public.eruditVersion"
+  />
+</template>

package/app/components/aside/major/settings/PaneSettings.vue

@@ -1,17 +1,17 @@
-<script lang="ts" setup>
-import ThemeSwitcher from './ThemeSwitcher.vue';
-import BuildTime from './BuildTime.vue';
-import Repository from './repository/Repository.vue';
-import EngineVersion from './EngineVersion.vue';
-</script>
-
-<template>
-  <AsideMajorPaneTemplate>
-    <ScrollHolder direction="rtl">
-      <ThemeSwitcher />
-      <BuildTime />
-      <Repository />
-      <EngineVersion />
-    </ScrollHolder>
-  </AsideMajorPaneTemplate>
-</template>
+<script lang="ts" setup>
+import ThemeSwitcher from './ThemeSwitcher.vue';
+import BuildTime from './BuildTime.vue';
+import Repository from './repository/Repository.vue';
+import EngineVersion from './EngineVersion.vue';
+</script>
+
+<template>
+  <AsideMajorPaneTemplate>
+    <ScrollHolder direction="rtl">
+      <ThemeSwitcher />
+      <BuildTime />
+      <Repository />
+      <EngineVersion />
+    </ScrollHolder>
+  </AsideMajorPaneTemplate>
+</template>

package/app/components/aside/major/settings/ThemeSwitcher.vue

@@ -1,55 +1,55 @@
-<script lang="ts" setup>
-import type { MaybeMyIconName } from '#my-icons';
-
-const loadingSvg = useLoadingSvg();
-
-const icon = ref<MaybeMyIconName>(loadingSvg);
-const themeName = ref<string>();
-
-let cycleThemeClick = () => {};
-
-const phrase = await usePhrases(
-  'theme',
-  'theme_light',
-  'theme_dark',
-  'theme_system',
-);
-
-onMounted(() => {
-  const { themePref, cycleTheme } = useTheme();
-
-  watch(
-    themePref,
-    (newThemePref) => {
-      switch (newThemePref) {
-        case 'system':
-          icon.value = 'sun-moon';
-          themeName.value = phrase.theme_system;
-          break;
-        case 'light':
-          icon.value = 'sun';
-          themeName.value = phrase.theme_light;
-          break;
-        case 'dark':
-          icon.value = 'moon';
-          themeName.value = phrase.theme_dark;
-          break;
-      }
-    },
-    { immediate: true },
-  );
-
-  cycleThemeClick = () => {
-    cycleTheme();
-  };
-});
-</script>
-
-<template>
-  <AsideListItem
-    :icon
-    :main="phrase.theme"
-    :secondary="themeName"
-    @click="cycleThemeClick"
-  />
-</template>
+<script lang="ts" setup>
+import type { MaybeMyIconName } from '#my-icons';
+
+const loadingSvg = useLoadingSvg();
+
+const icon = ref<MaybeMyIconName>(loadingSvg);
+const themeName = ref<string>();
+
+let cycleThemeClick = () => {};
+
+const phrase = await usePhrases(
+  'theme',
+  'theme_light',
+  'theme_dark',
+  'theme_system',
+);
+
+onMounted(() => {
+  const { themePref, cycleTheme } = useTheme();
+
+  watch(
+    themePref,
+    (newThemePref) => {
+      switch (newThemePref) {
+        case 'system':
+          icon.value = 'sun-moon';
+          themeName.value = phrase.theme_system;
+          break;
+        case 'light':
+          icon.value = 'sun';
+          themeName.value = phrase.theme_light;
+          break;
+        case 'dark':
+          icon.value = 'moon';
+          themeName.value = phrase.theme_dark;
+          break;
+      }
+    },
+    { immediate: true },
+  );
+
+  cycleThemeClick = () => {
+    cycleTheme();
+  };
+});
+</script>
+
+<template>
+  <AsideListItem
+    :icon
+    :main="phrase.theme"
+    :secondary="themeName"
+    @click="cycleThemeClick"
+  />
+</template>

package/app/components/aside/major/settings/repository/Repository.vue

@@ -1,33 +1,33 @@
-<script lang="ts" setup>
-import type { EruditRepositoryType } from '@erudit-js/core/eruditConfig/repository';
-
-const repository = ERUDIT.config.repository;
-const phrase = await usePhrases('content');
-
-type SecondaryComponents = Record<EruditRepositoryType, any>;
-
-const secondaryComponents = {
-  custom: undefined,
-  github: defineAsyncComponent(() => import('./SecondaryGitHub.vue')),
-} as const satisfies SecondaryComponents;
-
-const SecondaryComponent = repository
-  ? secondaryComponents[repository.type]
-  : undefined;
-</script>
-
-<template>
-  <AsideListItem
-    v-if="repository"
-    icon="draw"
-    target="_blank"
-    :to="repository._link"
-    :main="phrase.content"
-  >
-    <template v-slot:secondary>
-      <div class="text-text-dimmed ps-[8px] text-xs font-[500]">
-        <SecondaryComponent v-if="SecondaryComponent" />
-      </div>
-    </template>
-  </AsideListItem>
-</template>
+<script lang="ts" setup>
+import type { EruditRepositoryType } from '@erudit-js/core/eruditConfig/repository';
+
+const repository = ERUDIT.config.repository;
+const phrase = await usePhrases('content');
+
+type SecondaryComponents = Record<EruditRepositoryType, any>;
+
+const secondaryComponents = {
+  custom: undefined,
+  github: defineAsyncComponent(() => import('./SecondaryGitHub.vue')),
+} as const satisfies SecondaryComponents;
+
+const SecondaryComponent = repository
+  ? secondaryComponents[repository.type]
+  : undefined;
+</script>
+
+<template>
+  <AsideListItem
+    v-if="repository"
+    icon="draw"
+    target="_blank"
+    :to="repository._link"
+    :main="phrase.content"
+  >
+    <template v-slot:secondary>
+      <div class="text-text-dimmed ps-[8px] text-xs font-[500]">
+        <SecondaryComponent v-if="SecondaryComponent" />
+      </div>
+    </template>
+  </AsideListItem>
+</template>