erudit 4.0.0-dev.5 → 4.0.1

package/app/composables/phrases.ts

@@ -1,126 +1,126 @@
-type PayloadLanguage = {
-  phrases: Partial<Record<LanguagePhraseKey, PayloadLanguagePhraseValue>>;
-  functions?: Record<string, string>;
-};
-
-type PhraseCaller<T extends readonly LanguagePhraseKey[]> = {
-  [K in T[number]]: LanguagePhrases[K];
-};
-
-const initialPayloadLanguage = {
-  phrases: {},
-  functions: undefined,
-};
-
-//
-// "functions" and "phrases" exist both on server and client side
-// On server side they serve as module-cache
-// On client side they act as singletons for whole Nuxt App
-// This is okay because language can't be changed after server initialization
-//
-
-let functions: Record<string, Function> | undefined = undefined;
-const phrases: Partial<LanguagePhrases> = {};
-
-export function usePhrases<const T extends readonly LanguagePhraseKey[]>(
-  ...phraseKeys: T
-): Promise<PhraseCaller<T>> {
-  const nuxtApp = useNuxtApp();
-  const payloadKey = 'raw-language';
-  const payloadLanguage: PayloadLanguage =
-    (nuxtApp.static.data[payloadKey] ||=
-    nuxtApp.payload.data[payloadKey] ||=
-      initialPayloadLanguage);
-
-  const ensureFunctionsInPayload = async () => {
-    if (payloadLanguage.functions) {
-      return;
-    }
-
-    const strFunctions = await $fetch<Record<string, string>>(
-      '/api/language/functions',
-    );
-
-    payloadLanguage.functions = strFunctions;
-  };
-
-  const restoreFunctionsFromPayload = async () => {
-    if (functions) {
-      return;
-    }
-
-    functions = {};
-    for (const [funcName, funcBody] of Object.entries(
-      payloadLanguage.functions!,
-    )) {
-      functions[funcName] = new Function('return ' + funcBody)();
-    }
-  };
-
-  const processPhrase = async (phraseKey: LanguagePhraseKey) => {
-    const phraseInPayload = payloadLanguage.phrases[phraseKey];
-    const phraseRestored = phrases[phraseKey];
-
-    let payloadPhraseValue: PayloadLanguagePhraseValue;
-
-    if (phraseInPayload) {
-      payloadPhraseValue = phraseInPayload;
-    } else {
-      try {
-        payloadPhraseValue = await $fetch<PayloadLanguagePhraseValue>(
-          `/api/language/phrase/${phraseKey}`,
-          {
-            responseType: 'json',
-          },
-        );
-
-        payloadLanguage.phrases[phraseKey] = payloadPhraseValue;
-      } catch {
-        throw createError({
-          statusCode: 503,
-          statusMessage: 'Service Unavailable',
-          message: `Failed to fetch phrase "${phraseKey}"!`,
-        });
-      }
-    }
-
-    if (payloadPhraseValue.type === 'missing') {
-      throw createError({
-        statusCode: 404,
-        statusMessage: 'Unknown phrase!',
-        message: `There is no phrase with key "${phraseKey}"!`,
-      });
-    }
-
-    if (phraseRestored) {
-      return;
-    }
-
-    switch (payloadPhraseValue.type) {
-      case 'string':
-        phrases[phraseKey] = payloadPhraseValue.value as any;
-        break;
-      case 'function':
-        phrases[phraseKey] = new Function(
-          'funcs',
-          `
-                            with (funcs) {
-                                return ${payloadPhraseValue.value};
-                            }
-                        `,
-        )(functions!);
-        break;
-    }
-  };
-
-  return Promise.resolve()
-    .then(ensureFunctionsInPayload)
-    .then(restoreFunctionsFromPayload)
-    .then(() =>
-      phraseKeys.reduce<Promise<void>>(
-        (p, key) => p.then(() => processPhrase(key)),
-        Promise.resolve(),
-      ),
-    )
-    .then(() => phrases as PhraseCaller<T>);
-}
+type PayloadLanguage = {
+  phrases: Partial<Record<LanguagePhraseKey, PayloadLanguagePhraseValue>>;
+  functions?: Record<string, string>;
+};
+
+type PhraseCaller<T extends readonly LanguagePhraseKey[]> = {
+  [K in T[number]]: LanguagePhrases[K];
+};
+
+const initialPayloadLanguage = {
+  phrases: {},
+  functions: undefined,
+};
+
+//
+// "functions" and "phrases" exist both on server and client side
+// On server side they serve as module-cache
+// On client side they act as singletons for whole Nuxt App
+// This is okay because language can't be changed after server initialization
+//
+
+let functions: Record<string, Function> | undefined = undefined;
+const phrases: Partial<LanguagePhrases> = {};
+
+export function usePhrases<const T extends readonly LanguagePhraseKey[]>(
+  ...phraseKeys: T
+): Promise<PhraseCaller<T>> {
+  const nuxtApp = useNuxtApp();
+  const payloadKey = 'raw-language';
+  const payloadLanguage: PayloadLanguage =
+    (nuxtApp.static.data[payloadKey] ||=
+    nuxtApp.payload.data[payloadKey] ||=
+      initialPayloadLanguage);
+
+  const ensureFunctionsInPayload = async () => {
+    if (payloadLanguage.functions) {
+      return;
+    }
+
+    const strFunctions = await $fetch<Record<string, string>>(
+      '/api/language/functions',
+    );
+
+    payloadLanguage.functions = strFunctions;
+  };
+
+  const restoreFunctionsFromPayload = async () => {
+    if (functions) {
+      return;
+    }
+
+    functions = {};
+    for (const [funcName, funcBody] of Object.entries(
+      payloadLanguage.functions!,
+    )) {
+      functions[funcName] = new Function('return ' + funcBody)();
+    }
+  };
+
+  const processPhrase = async (phraseKey: LanguagePhraseKey) => {
+    const phraseInPayload = payloadLanguage.phrases[phraseKey];
+    const phraseRestored = phrases[phraseKey];
+
+    let payloadPhraseValue: PayloadLanguagePhraseValue;
+
+    if (phraseInPayload) {
+      payloadPhraseValue = phraseInPayload;
+    } else {
+      try {
+        payloadPhraseValue = await $fetch<PayloadLanguagePhraseValue>(
+          `/api/language/phrase/${phraseKey}`,
+          {
+            responseType: 'json',
+          },
+        );
+
+        payloadLanguage.phrases[phraseKey] = payloadPhraseValue;
+      } catch {
+        throw createError({
+          statusCode: 503,
+          statusMessage: 'Service Unavailable',
+          message: `Failed to fetch phrase "${phraseKey}"!`,
+        });
+      }
+    }
+
+    if (payloadPhraseValue.type === 'missing') {
+      throw createError({
+        statusCode: 404,
+        statusMessage: 'Unknown phrase!',
+        message: `There is no phrase with key "${phraseKey}"!`,
+      });
+    }
+
+    if (phraseRestored) {
+      return;
+    }
+
+    switch (payloadPhraseValue.type) {
+      case 'string':
+        phrases[phraseKey] = payloadPhraseValue.value as any;
+        break;
+      case 'function':
+        phrases[phraseKey] = new Function(
+          'funcs',
+          `
+                            with (funcs) {
+                                return ${payloadPhraseValue.value};
+                            }
+                        `,
+        )(functions!);
+        break;
+    }
+  };
+
+  return Promise.resolve()
+    .then(ensureFunctionsInPayload)
+    .then(restoreFunctionsFromPayload)
+    .then(() =>
+      phraseKeys.reduce<Promise<void>>(
+        (p, key) => p.then(() => processPhrase(key)),
+        Promise.resolve(),
+      ),
+    )
+    .then(() => phrases as PhraseCaller<T>);
+}

package/app/composables/preview.ts

@@ -1,53 +1,53 @@
-export const usePreview = () => {
-  const previewState = useState<PreviewState>('preview', () => ({
-    opened: false,
-    request: undefined,
-    history: [],
-    blink: 0,
-  }));
-
-  const hasPreviousRequest = computed(
-    () => previewState.value.history.length > 0,
-  );
-
-  function setPreview(request: PreviewRequest) {
-    if (toStringEqual(request, previewState.value.request)) {
-      if (previewState.value.opened) {
-        previewState.value.blink += 1;
-      } else {
-        previewState.value.opened = true;
-      }
-      return;
-    }
-
-    if (previewState.value.request) {
-      previewState.value.history.push(previewState.value.request);
-    }
-
-    previewState.value.request = request;
-    previewState.value.opened = true;
-  }
-
-  function setPreviousPreview() {
-    if (!hasPreviousRequest.value) {
-      return;
-    }
-
-    previewState.value.request = previewState.value.history.pop();
-    previewState.value.opened = true;
-  }
-
-  function closePreview() {
-    previewState.value.opened = false;
-    previewState.value.request = undefined;
-    previewState.value.history = [];
-  }
-
-  return {
-    previewState,
-    hasPreviousRequest,
-    setPreview,
-    setPreviousPreview,
-    closePreview,
-  };
-};
+export const usePreview = () => {
+  const previewState = useState<PreviewState>('preview', () => ({
+    opened: false,
+    request: undefined,
+    history: [],
+    blink: 0,
+  }));
+
+  const hasPreviousRequest = computed(
+    () => previewState.value.history.length > 0,
+  );
+
+  function setPreview(request: PreviewRequest) {
+    if (toStringEqual(request, previewState.value.request)) {
+      if (previewState.value.opened) {
+        previewState.value.blink += 1;
+      } else {
+        previewState.value.opened = true;
+      }
+      return;
+    }
+
+    if (previewState.value.request) {
+      previewState.value.history.push(previewState.value.request);
+    }
+
+    previewState.value.request = request;
+    previewState.value.opened = true;
+  }
+
+  function setPreviousPreview() {
+    if (!hasPreviousRequest.value) {
+      return;
+    }
+
+    previewState.value.request = previewState.value.history.pop();
+    previewState.value.opened = true;
+  }
+
+  function closePreview() {
+    previewState.value.opened = false;
+    previewState.value.request = undefined;
+    previewState.value.history = [];
+  }
+
+  return {
+    previewState,
+    hasPreviousRequest,
+    setPreview,
+    setPreviousPreview,
+    closePreview,
+  };
+};

package/app/composables/route.ts

@@ -1,6 +1,6 @@
-export function useRoutePath() {
-  const route = useRoute();
-  return computed(() =>
-    route.path.endsWith('/') ? route.path : route.path + '/',
-  );
-}
+export function useRoutePath() {
+  const route = useRoute();
+  return computed(() =>
+    route.path.endsWith('/') ? route.path : route.path + '/',
+  );
+}

package/app/composables/theme.ts

@@ -1,67 +1,67 @@
-const binaryThemes = ['light', 'dark'] as const;
-const themePreferences = [...binaryThemes, 'system'] as const;
-const localStorageKey = 'theme';
-
-export type BinaryTheme = (typeof binaryThemes)[number];
-export type ThemePreference = (typeof themePreferences)[number];
-
-export const useTheme = () => {
-  if (import.meta.server) {
-    throw createError({
-      statusCode: 400,
-      statusMessage: 'Theme composable is not available on server side!',
-    });
-  }
-
-  const preference = useState(
-    'theme-preference',
-    () => localStorage.getItem(localStorageKey) as ThemePreference,
-  );
-
-  return {
-    themePref: preference,
-    binaryTheme: computed(() => pref2binary(preference.value)),
-    setTheme: (newPref: ThemePreference) => {
-      localStorage.setItem(localStorageKey, newPref);
-      preference.value = newPref;
-    },
-    cycleTheme: () => {
-      const current = preference.value;
-      const next =
-        themePreferences[
-          (themePreferences.indexOf(current) + 1) % themePreferences.length
-        ]!;
-      localStorage.setItem(localStorageKey, next);
-      preference.value = next;
-    },
-  };
-};
-
-export const initThemeWatcher = () => {
-  onMounted(() => {
-    const { themePref, binaryTheme } = useTheme();
-
-    watch(binaryTheme, (newValue) => {
-      document.documentElement.setAttribute('data-theme', newValue);
-    });
-
-    window
-      .matchMedia('(prefers-color-scheme: dark)')
-      .addEventListener('change', (event) => {
-        const newValue = event.matches ? 'dark' : 'light';
-        if (themePref.value === 'system') {
-          document.documentElement.setAttribute('data-theme', newValue);
-        }
-      });
-  });
-};
-
-function pref2binary(pref: ThemePreference): BinaryTheme {
-  if (binaryThemes.includes(pref as BinaryTheme)) {
-    return pref as BinaryTheme;
-  }
-
-  return window.matchMedia('(prefers-color-scheme: dark)').matches
-    ? 'dark'
-    : 'light';
-}
+const binaryThemes = ['light', 'dark'] as const;
+const themePreferences = [...binaryThemes, 'system'] as const;
+const localStorageKey = 'theme';
+
+export type BinaryTheme = (typeof binaryThemes)[number];
+export type ThemePreference = (typeof themePreferences)[number];
+
+export const useTheme = () => {
+  if (import.meta.server) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: 'Theme composable is not available on server side!',
+    });
+  }
+
+  const preference = useState(
+    'theme-preference',
+    () => localStorage.getItem(localStorageKey) as ThemePreference,
+  );
+
+  return {
+    themePref: preference,
+    binaryTheme: computed(() => pref2binary(preference.value)),
+    setTheme: (newPref: ThemePreference) => {
+      localStorage.setItem(localStorageKey, newPref);
+      preference.value = newPref;
+    },
+    cycleTheme: () => {
+      const current = preference.value;
+      const next =
+        themePreferences[
+          (themePreferences.indexOf(current) + 1) % themePreferences.length
+        ]!;
+      localStorage.setItem(localStorageKey, next);
+      preference.value = next;
+    },
+  };
+};
+
+export const initThemeWatcher = () => {
+  onMounted(() => {
+    const { themePref, binaryTheme } = useTheme();
+
+    watch(binaryTheme, (newValue) => {
+      document.documentElement.setAttribute('data-theme', newValue);
+    });
+
+    window
+      .matchMedia('(prefers-color-scheme: dark)')
+      .addEventListener('change', (event) => {
+        const newValue = event.matches ? 'dark' : 'light';
+        if (themePref.value === 'system') {
+          document.documentElement.setAttribute('data-theme', newValue);
+        }
+      });
+  });
+};
+
+function pref2binary(pref: ThemePreference): BinaryTheme {
+  if (binaryThemes.includes(pref as BinaryTheme)) {
+    return pref as BinaryTheme;
+  }
+
+  return window.matchMedia('(prefers-color-scheme: dark)').matches
+    ? 'dark'
+    : 'light';
+}

package/app/composables/url.ts

@@ -1,30 +1,30 @@
-import { sn } from 'unslash';
-
-export function useBaseUrl() {
-  const runtimeConfig = useRuntimeConfig();
-  const baseUrl = runtimeConfig.app.baseURL;
-
-  return (path: string): string => {
-    if (path.startsWith('/')) {
-      return `${baseUrl}${path.slice(1)}`;
-    }
-
-    return path;
-  };
-}
-
-export function useSiteUrl() {
-  const runtimeConfig = useRuntimeConfig();
-  const siteUrl = runtimeConfig.public.siteUrl;
-
-  return (path?: string): string => {
-    // Return external URLs as is
-    if (path) {
-      if (!path.startsWith('/')) {
-        return path;
-      }
-    }
-
-    return sn(siteUrl, path || '');
-  };
-}
+import { sn } from 'unslash';
+
+export function useBaseUrl() {
+  const runtimeConfig = useRuntimeConfig();
+  const baseUrl = runtimeConfig.app.baseURL;
+
+  return (path: string): string => {
+    if (path.startsWith('/')) {
+      return `${baseUrl}${path.slice(1)}`;
+    }
+
+    return path;
+  };
+}
+
+export function useSiteUrl() {
+  const runtimeConfig = useRuntimeConfig();
+  const siteUrl = runtimeConfig.public.siteUrl;
+
+  return (path?: string): string => {
+    // Return external URLs as is
+    if (path) {
+      if (!path.startsWith('/')) {
+        return path;
+      }
+    }
+
+    return sn(siteUrl, path || '');
+  };
+}

package/app/formatters/ru.ts

@@ -1,14 +1,14 @@
-export default (text: string) => {
-  text = ruStickyPrepositions(text);
-  return text;
-};
-
-/**
- * Formats prepositions in Russian text so that they are always adjacent to the next word and are not left hanging “in the air” when the line breaks.
- */
-function ruStickyPrepositions(text: string): string {
-  return text.replace(
-    / (в|не|без|для|до|за|из|к|на|над|о|об|от|по|под|при|про|с|у|через|вокруг|около|после|перед|между|внутри|вне|из-за|из-под|ради|сквозь|среди|насчёт|вследствие|благодаря|несмотря|наперекор|вопреки|подле|возле|рядом|навстречу) /gimu,
-    ' $1\xa0',
-  );
-}
+export default (text: string) => {
+  text = ruStickyPrepositions(text);
+  return text;
+};
+
+/**
+ * Formats prepositions in Russian text so that they are always adjacent to the next word and are not left hanging “in the air” when the line breaks.
+ */
+function ruStickyPrepositions(text: string): string {
+  return text.replace(
+    / (в|не|без|для|до|за|из|к|на|над|о|об|от|по|под|при|про|с|у|через|вокруг|около|после|перед|между|внутри|вне|из-за|из-под|ради|сквозь|среди|насчёт|вследствие|благодаря|несмотря|наперекор|вопреки|подле|возле|рядом|навстречу) /gimu,
+    ' $1\xa0',
+  );
+}

package/app/pages/article/[...articleId].vue

@@ -1,12 +1,12 @@
-<script setup lang="ts">
-const route = useRoute();
-const articleId = Array.isArray(route.params.articleId)
-  ? route.params.articleId.join('/')
-  : route.params.articleId!;
-const contentTypePath = stringifyContentTypePath('article', articleId);
-const mainContent = await useMainContent<MainContentTopicPart>(contentTypePath);
-</script>
-
-<template>
-  <MainTopicPartPage :mainContent />
-</template>
+<script setup lang="ts">
+const route = useRoute();
+const articleId = Array.isArray(route.params.articleId)
+  ? route.params.articleId.join('/')
+  : route.params.articleId!;
+const contentTypePath = stringifyContentTypePath('article', articleId);
+const mainContent = await useMainContent<MainContentTopicPart>(contentTypePath);
+</script>
+
+<template>
+  <MainTopicPartPage :mainContent />
+</template>