erudit 4.0.0-dev.5 → 4.0.1

package/app/composables/asideMinor.ts

@@ -1,109 +1,109 @@
-import type {
-  ContentContribution,
-  ContributorContribution,
-} from '@erudit-js/core/content/contributions';
-import type { TopicPart } from '@erudit-js/core/content/topic';
-import type { ContentType } from '@erudit-js/core/content/type';
-import type { ResolvedTocItem } from '@erudit-js/prose';
-
-export interface AsideMinorStateNews {
-  type: 'news';
-}
-
-export interface AsideMinorContributor {
-  type: 'contributor';
-  contributions?: ContributorContribution[];
-}
-
-export interface AsideMinorContentContributions {
-  type: 'content-contributions';
-  contentRelativePath: string;
-  contentType: ContentType;
-  topicPart?: TopicPart;
-  contributions?: ContentContribution[];
-}
-
-export interface AsideMinorContentPage {
-  type: 'content-page';
-  contentRelativePath: string;
-  toc?: ResolvedTocItem[];
-  contributions?: ContentContribution[];
-}
-
-export interface AsideMinorContentTopic {
-  type: 'content-topic';
-  topicPart: TopicPart;
-  contentRelativePath: string;
-  shortContentId: string;
-  parts: TopicPart[];
-  toc?: ResolvedTocItem[];
-  contributions?: ContentContribution[];
-}
-
-export type AsideMinorState =
-  | AsideMinorStateNews
-  | AsideMinorContributor
-  | AsideMinorContentContributions
-  | AsideMinorContentPage
-  | AsideMinorContentTopic;
-
-export const useAsideMinor = () => {
-  const asideMinor = useState<AsideMinorState | undefined>('aside-minor');
-
-  return {
-    asideMinorState: asideMinor,
-    showNewsAside() {
-      asideMinor.value = { type: 'news' };
-    },
-    showContributorAside(contributions?: ContributorContribution[]) {
-      asideMinor.value = {
-        type: 'contributor',
-        contributions,
-      };
-    },
-    showContentContributionsAside(
-      contentRelativePath: string,
-      contentType: ContentType,
-      topicPart?: TopicPart,
-      contributions?: ContentContribution[],
-    ) {
-      asideMinor.value = {
-        type: 'content-contributions',
-        contentRelativePath,
-        contentType,
-        topicPart,
-        contributions,
-      };
-    },
-    showContentPageAside(
-      contentRelativePath: string,
-      toc?: ResolvedTocItem[],
-      contributions?: ContentContribution[],
-    ) {
-      asideMinor.value = {
-        type: 'content-page',
-        contentRelativePath,
-        toc,
-        contributions,
-      };
-    },
-    showContentTopicAside(args: {
-      part: TopicPart;
-      parts: TopicPart[];
-      shortContentId: string;
-      contentRelativePath: string;
-      toc?: ResolvedTocItem[];
-      contributions?: ContentContribution[];
-    }) {
-      asideMinor.value = {
-        type: 'content-topic',
-        topicPart: args.part,
-        contentRelativePath: args.contentRelativePath,
-        toc: args.toc,
-        contributions: args.contributions,
-        shortContentId: args.shortContentId,
-        parts: args.parts,
-      };
-    },
-  };
-};
+import type {
+  ContentContribution,
+  ContributorContribution,
+} from '@erudit-js/core/content/contributions';
+import type { TopicPart } from '@erudit-js/core/content/topic';
+import type { ContentType } from '@erudit-js/core/content/type';
+import type { ResolvedTocItem } from '@erudit-js/prose';
+
+export interface AsideMinorStateNews {
+  type: 'news';
+}
+
+export interface AsideMinorContributor {
+  type: 'contributor';
+  contributions?: ContributorContribution[];
+}
+
+export interface AsideMinorContentContributions {
+  type: 'content-contributions';
+  contentRelativePath: string;
+  contentType: ContentType;
+  topicPart?: TopicPart;
+  contributions?: ContentContribution[];
+}
+
+export interface AsideMinorContentPage {
+  type: 'content-page';
+  contentRelativePath: string;
+  toc?: ResolvedTocItem[];
+  contributions?: ContentContribution[];
+}
+
+export interface AsideMinorContentTopic {
+  type: 'content-topic';
+  topicPart: TopicPart;
+  contentRelativePath: string;
+  shortContentId: string;
+  parts: TopicPart[];
+  toc?: ResolvedTocItem[];
+  contributions?: ContentContribution[];
+}
+
+export type AsideMinorState =
+  | AsideMinorStateNews
+  | AsideMinorContributor
+  | AsideMinorContentContributions
+  | AsideMinorContentPage
+  | AsideMinorContentTopic;
+
+export const useAsideMinor = () => {
+  const asideMinor = useState<AsideMinorState | undefined>('aside-minor');
+
+  return {
+    asideMinorState: asideMinor,
+    showNewsAside() {
+      asideMinor.value = { type: 'news' };
+    },
+    showContributorAside(contributions?: ContributorContribution[]) {
+      asideMinor.value = {
+        type: 'contributor',
+        contributions,
+      };
+    },
+    showContentContributionsAside(
+      contentRelativePath: string,
+      contentType: ContentType,
+      topicPart?: TopicPart,
+      contributions?: ContentContribution[],
+    ) {
+      asideMinor.value = {
+        type: 'content-contributions',
+        contentRelativePath,
+        contentType,
+        topicPart,
+        contributions,
+      };
+    },
+    showContentPageAside(
+      contentRelativePath: string,
+      toc?: ResolvedTocItem[],
+      contributions?: ContentContribution[],
+    ) {
+      asideMinor.value = {
+        type: 'content-page',
+        contentRelativePath,
+        toc,
+        contributions,
+      };
+    },
+    showContentTopicAside(args: {
+      part: TopicPart;
+      parts: TopicPart[];
+      shortContentId: string;
+      contentRelativePath: string;
+      toc?: ResolvedTocItem[];
+      contributions?: ContentContribution[];
+    }) {
+      asideMinor.value = {
+        type: 'content-topic',
+        topicPart: args.part,
+        contentRelativePath: args.contentRelativePath,
+        toc: args.toc,
+        contributions: args.contributions,
+        shortContentId: args.shortContentId,
+        parts: args.parts,
+      };
+    },
+  };
+};

package/app/composables/contentNav.ts

@@ -1,7 +1,7 @@
-const contentNavGlobalKey = 'contentNav-global';
-
-export const contentNavSymbol = Symbol() as InjectionKey<{
-  shortContentId: ComputedRef<string | undefined>;
-  shortBookId: ComputedRef<string | undefined>;
-  showBookNav: Ref<boolean>;
-}>;
+const contentNavGlobalKey = 'contentNav-global';
+
+export const contentNavSymbol = Symbol() as InjectionKey<{
+  shortContentId: ComputedRef<string | undefined>;
+  shortBookId: ComputedRef<string | undefined>;
+  showBookNav: Ref<boolean>;
+}>;

package/app/composables/favicon.ts

@@ -1,103 +1,103 @@
-import { isTopicPart, type TopicPart } from '@erudit-js/core/content/topic';
-import { isContentType, type ContentType } from '@erudit-js/core/content/type';
-
-const fallbackFaviconHref = eruditPublic('favicons/default.svg');
-
-export const useFaviconHref = () => {
-  return useState<string>('favicon-href', () => fallbackFaviconHref);
-};
-
-export function useFavicon() {
-  const faviconHref = useFaviconHref();
-
-  function showDefaultFavicon() {
-    const defaultFaviconHref = ERUDIT.config.siteInfo?.favicon?.default;
-    faviconHref.value = defaultFaviconHref || fallbackFaviconHref;
-  }
-
-  function showContentFavicon(
-    args:
-      | { type: Exclude<ContentType, 'topic'> }
-      | { type: 'topic'; part: TopicPart },
-  ) {
-    if (args.type === 'topic') {
-      const topicPartHref = ERUDIT.config.siteInfo?.favicon?.[args.part];
-      if (topicPartHref) {
-        faviconHref.value = topicPartHref;
-        return;
-      }
-    } else {
-      const typeHref = ERUDIT.config.siteInfo?.favicon?.[args.type];
-      if (typeHref) {
-        faviconHref.value = typeHref;
-        return;
-      }
-    }
-
-    showDefaultFavicon();
-  }
-
-  return {
-    showDefaultFavicon,
-    showContentFavicon,
-  };
-}
-
-export function initFavicon() {
-  const withBaseUrl = useBaseUrl();
-  const faviconHref = useFaviconHref();
-  const { showDefaultFavicon, showContentFavicon } = useFavicon();
-  showDefaultFavicon();
-
-  useHead({
-    link: [
-      computed(() => ({
-        key: 'favicon',
-        rel: 'icon',
-        href: withBaseUrl(faviconHref.value),
-      })),
-    ],
-  });
-
-  const route = useRoute();
-  const contentFaviconDelay = 5000;
-  let contentFaviconChangeTimeout: ReturnType<typeof setTimeout>;
-  let stopWatchingRoute: ReturnType<typeof watch> | undefined;
-  onMounted(() => {
-    stopWatchingRoute = watch(
-      route,
-      () => {
-        clearTimeout(contentFaviconChangeTimeout);
-
-        const firstPathPart = route.path.split('/')[1];
-
-        if (isTopicPart(firstPathPart)) {
-          contentFaviconChangeTimeout = setTimeout(() => {
-            showContentFavicon({
-              type: 'topic',
-              part: firstPathPart,
-            });
-          }, contentFaviconDelay);
-          return;
-        }
-
-        if (isContentType(firstPathPart)) {
-          contentFaviconChangeTimeout = setTimeout(() => {
-            showContentFavicon({
-              type: firstPathPart as Exclude<ContentType, 'topic'>,
-            });
-          }, contentFaviconDelay);
-          return;
-        }
-
-        showDefaultFavicon();
-      },
-      { immediate: true },
-    );
-  });
-
-  onBeforeUnmount(() => {
-    clearTimeout(contentFaviconChangeTimeout);
-    stopWatchingRoute?.();
-  });
-}
+import { isTopicPart, type TopicPart } from '@erudit-js/core/content/topic';
+import { isContentType, type ContentType } from '@erudit-js/core/content/type';
+
+const fallbackFaviconHref = eruditPublic('favicons/default.svg');
+
+export const useFaviconHref = () => {
+  return useState<string>('favicon-href', () => fallbackFaviconHref);
+};
+
+export function useFavicon() {
+  const faviconHref = useFaviconHref();
+
+  function showDefaultFavicon() {
+    const defaultFaviconHref = ERUDIT.config.siteInfo?.favicon?.default;
+    faviconHref.value = defaultFaviconHref || fallbackFaviconHref;
+  }
+
+  function showContentFavicon(
+    args:
+      | { type: Exclude<ContentType, 'topic'> }
+      | { type: 'topic'; part: TopicPart },
+  ) {
+    if (args.type === 'topic') {
+      const topicPartHref = ERUDIT.config.siteInfo?.favicon?.[args.part];
+      if (topicPartHref) {
+        faviconHref.value = topicPartHref;
+        return;
+      }
+    } else {
+      const typeHref = ERUDIT.config.siteInfo?.favicon?.[args.type];
+      if (typeHref) {
+        faviconHref.value = typeHref;
+        return;
+      }
+    }
+
+    showDefaultFavicon();
+  }
+
+  return {
+    showDefaultFavicon,
+    showContentFavicon,
+  };
+}
+
+export function initFavicon() {
+  const withBaseUrl = useBaseUrl();
+  const faviconHref = useFaviconHref();
+  const { showDefaultFavicon, showContentFavicon } = useFavicon();
+  showDefaultFavicon();
+
+  useHead({
+    link: [
+      computed(() => ({
+        key: 'favicon',
+        rel: 'icon',
+        href: withBaseUrl(faviconHref.value),
+      })),
+    ],
+  });
+
+  const route = useRoute();
+  const contentFaviconDelay = 5000;
+  let contentFaviconChangeTimeout: ReturnType<typeof setTimeout>;
+  let stopWatchingRoute: ReturnType<typeof watch> | undefined;
+  onMounted(() => {
+    stopWatchingRoute = watch(
+      route,
+      () => {
+        clearTimeout(contentFaviconChangeTimeout);
+
+        const firstPathPart = route.path.split('/')[1];
+
+        if (isTopicPart(firstPathPart)) {
+          contentFaviconChangeTimeout = setTimeout(() => {
+            showContentFavicon({
+              type: 'topic',
+              part: firstPathPart,
+            });
+          }, contentFaviconDelay);
+          return;
+        }
+
+        if (isContentType(firstPathPart)) {
+          contentFaviconChangeTimeout = setTimeout(() => {
+            showContentFavicon({
+              type: firstPathPart as Exclude<ContentType, 'topic'>,
+            });
+          }, contentFaviconDelay);
+          return;
+        }
+
+        showDefaultFavicon();
+      },
+      { immediate: true },
+    );
+  });
+
+  onBeforeUnmount(() => {
+    clearTimeout(contentFaviconChangeTimeout);
+    stopWatchingRoute?.();
+  });
+}

package/app/composables/file.ts

@@ -1,4 +1,4 @@
-export function fileUrl(path: string) {
-  const withBaseUrl = useBaseUrl();
-  return withBaseUrl('/file/' + path);
-}
+export function fileUrl(path: string) {
+  const withBaseUrl = useBaseUrl();
+  return withBaseUrl('/file/' + path);
+}

package/app/composables/formatText.ts

@@ -1,100 +1,100 @@
-import type { FormatTextState, FormatText } from '@erudit-js/core/formatText';
-
-type LanguageFormatText = (text: string) => string;
-
-const formatTextLoaders: Partial<
-  Record<LanguageCode, () => Promise<{ default: LanguageFormatText }>>
-> = {
-  ru: () => import('../formatters/ru'),
-};
-
-export let formatText: FormatText;
-
-export async function initFormatText() {
-  const languageCode = ERUDIT.config.language.current;
-
-  const formatTextLoader =
-    languageCode in formatTextLoaders
-      ? formatTextLoaders[languageCode]
-      : undefined;
-
-  let languageFormatText: LanguageFormatText = (text) => text;
-  if (formatTextLoader) {
-    languageFormatText = (await formatTextLoader()).default;
-  }
-
-  function _formatText(text: string, state?: FormatTextState): string;
-  function _formatText(text: undefined, state?: FormatTextState): undefined;
-  function _formatText(
-    text?: string,
-    state?: FormatTextState,
-  ): string | undefined;
-  function _formatText(
-    text?: string,
-    state?: FormatTextState,
-  ): string | undefined {
-    if (text === undefined) {
-      return text;
-    }
-
-    //
-    // Normalize spacing (new lines, spaces)
-    //
-
-    {
-      text = text
-        .trim()
-        .replace(/\r\n/gm, '\n')
-        .replace(/\n{3,}/gm, '\n\n')
-        .replace(/[ \t]+/gm, ' ');
-    }
-
-    //
-    // Normalize dashes
-    //
-
-    {
-      text = text.replace(/(^| )--($| )/gm, '$1—$2');
-    }
-
-    //
-    // Normalize quotes
-    //
-
-    {
-      const quoteSymbols: [string, string] = (() => {
-        switch (languageCode) {
-          case 'ru':
-            return ['«', '»'];
-          default:
-            return ['“', '”'];
-        }
-      })();
-
-      let quoteOpen = state?.quote === 'opened';
-      text = text.replaceAll(/"/gm, () => {
-        quoteOpen = !quoteOpen;
-        if (state) {
-          state.quote = quoteOpen ? 'opened' : 'closed';
-        }
-        return quoteOpen ? quoteSymbols[0] : quoteSymbols[1];
-      });
-    }
-
-    //
-    // Normalize ellipsis
-    //
-
-    {
-      text = text.replace(/\.{3}/gm, '…');
-    }
-
-    //
-    // Language-specific formatting
-    //
-
-    return languageFormatText(text);
-  }
-
-  formatText = _formatText;
-}
+import type { FormatTextState, FormatText } from '@erudit-js/core/formatText';
+
+type LanguageFormatText = (text: string) => string;
+
+const formatTextLoaders: Partial<
+  Record<LanguageCode, () => Promise<{ default: LanguageFormatText }>>
+> = {
+  ru: () => import('../formatters/ru'),
+};
+
+export let formatText: FormatText;
+
+export async function initFormatText() {
+  const languageCode = ERUDIT.config.language.current;
+
+  const formatTextLoader =
+    languageCode in formatTextLoaders
+      ? formatTextLoaders[languageCode]
+      : undefined;
+
+  let languageFormatText: LanguageFormatText = (text) => text;
+  if (formatTextLoader) {
+    languageFormatText = (await formatTextLoader()).default;
+  }
+
+  function _formatText(text: string, state?: FormatTextState): string;
+  function _formatText(text: undefined, state?: FormatTextState): undefined;
+  function _formatText(
+    text?: string,
+    state?: FormatTextState,
+  ): string | undefined;
+  function _formatText(
+    text?: string,
+    state?: FormatTextState,
+  ): string | undefined {
+    if (text === undefined) {
+      return text;
+    }
+
+    //
+    // Normalize spacing (new lines, spaces)
+    //
+
+    {
+      text = text
+        .trim()
+        .replace(/\r\n/gm, '\n')
+        .replace(/\n{3,}/gm, '\n\n')
+        .replace(/[ \t]+/gm, ' ');
+    }
+
+    //
+    // Normalize dashes
+    //
+
+    {
+      text = text.replace(/(^| )--($| )/gm, '$1—$2');
+    }
+
+    //
+    // Normalize quotes
+    //
+
+    {
+      const quoteSymbols: [string, string] = (() => {
+        switch (languageCode) {
+          case 'ru':
+            return ['«', '»'];
+          default:
+            return ['“', '”'];
+        }
+      })();
+
+      let quoteOpen = state?.quote === 'opened';
+      text = text.replaceAll(/"/gm, () => {
+        quoteOpen = !quoteOpen;
+        if (state) {
+          state.quote = quoteOpen ? 'opened' : 'closed';
+        }
+        return quoteOpen ? quoteSymbols[0] : quoteSymbols[1];
+      });
+    }
+
+    //
+    // Normalize ellipsis
+    //
+
+    {
+      text = text.replace(/\.{3}/gm, '…');
+    }
+
+    //
+    // Language-specific formatting
+    //
+
+    return languageFormatText(text);
+  }
+
+  formatText = _formatText;
+}