erudit 3.0.0-dev.17 → 3.0.0-dev.18

package/app/composables/externalApi.ts

@@ -1,69 +1,69 @@
-import type { EruditConfigDebug } from '@erudit-js/cog/schema';
-
-import eruditConfig from '#erudit/config';
-
-let languagesCache: any;
-let repositoryCache: any;
-
-function useFakeUrl(
-    fakeApiTarget: keyof EruditConfigDebug['fakeApi'],
-): boolean {
-    return eruditConfig.debug?.fakeApi?.[fakeApiTarget] ?? import.meta.dev;
-}
-
-function getPayload() {
-    const nuxt = useNuxtApp();
-    const payloadKey = 'external-api';
-    const payload =
-        (nuxt.static.data[payloadKey] ||=
-        nuxt.payload.data[payloadKey] ||=
-            {});
-
-    return payload;
-}
-
-export async function useExternalApiLanguages() {
-    const sharedUrl = eruditConfig.repository?.sharedUrl;
-    if (!sharedUrl) return {};
-
-    const payload = getPayload();
-    const fake = useFakeUrl('languages');
-
-    if (fake) {
-        payload.languages ||= languagesCache ||= await $fetch(
-            '/api/fake/shared/languages',
-        );
-    } else {
-        payload.languages ||= languagesCache ||= await $fetch(
-            `https://api.github.com/repos/${sharedUrl}/contents/languages.json`,
-            {
-                headers: { Accept: 'application/vnd.github.v3.raw' },
-                responseType: 'json',
-                //transform: (response: string) => JSON.parse(response),
-            },
-        );
-    }
-
-    return payload.languages;
-}
-
-export async function useExternalApiRepository() {
-    const repositoryName = eruditConfig.repository?.name;
-    const repositoryBranch = eruditConfig.repository?.branch;
-
-    if (!repositoryName || !repositoryBranch) return undefined;
-
-    const payload = getPayload();
-    const fake = useFakeUrl('repository');
-
-    if (fake) {
-        payload.repository ||= repositoryCache ||=
-            await $fetch('/api/fake/content');
-    } else {
-        payload.repository ||= repositoryCache ||= await $fetch(
-            `https://api.github.com/repos/${repositoryName}/branches/${repositoryBranch}`,
-        );
-    }
-
-    return payload.repository;
-}
+import type { EruditConfigDebug } from '@erudit-js/cog/schema';
+
+import eruditConfig from '#erudit/config';
+
+let languagesCache: any;
+let repositoryCache: any;
+
+function useFakeUrl(
+    fakeApiTarget: keyof EruditConfigDebug['fakeApi'],
+): boolean {
+    return eruditConfig.debug?.fakeApi?.[fakeApiTarget] ?? import.meta.dev;
+}
+
+function getPayload() {
+    const nuxt = useNuxtApp();
+    const payloadKey = 'external-api';
+    const payload =
+        (nuxt.static.data[payloadKey] ||=
+        nuxt.payload.data[payloadKey] ||=
+            {});
+
+    return payload;
+}
+
+export async function useExternalApiLanguages() {
+    const sharedUrl = eruditConfig.repository?.sharedUrl;
+    if (!sharedUrl) return {};
+
+    const payload = getPayload();
+    const fake = useFakeUrl('languages');
+
+    if (fake) {
+        payload.languages ||= languagesCache ||= await $fetch(
+            '/api/fake/shared/languages',
+        );
+    } else {
+        payload.languages ||= languagesCache ||= await $fetch(
+            `https://api.github.com/repos/${sharedUrl}/contents/languages.json`,
+            {
+                headers: { Accept: 'application/vnd.github.v3.raw' },
+                responseType: 'json',
+                //transform: (response: string) => JSON.parse(response),
+            },
+        );
+    }
+
+    return payload.languages;
+}
+
+export async function useExternalApiRepository() {
+    const repositoryName = eruditConfig.repository?.name;
+    const repositoryBranch = eruditConfig.repository?.branch;
+
+    if (!repositoryName || !repositoryBranch) return undefined;
+
+    const payload = getPayload();
+    const fake = useFakeUrl('repository');
+
+    if (fake) {
+        payload.repository ||= repositoryCache ||=
+            await $fetch('/api/fake/content');
+    } else {
+        payload.repository ||= repositoryCache ||= await $fetch(
+            `https://api.github.com/repos/${repositoryName}/branches/${repositoryBranch}`,
+        );
+    }
+
+    return payload.repository;
+}

package/app/composables/favicon.ts

@@ -1,8 +1,8 @@
-import eruditConfig from '#erudit/config';
-
-export const defaultFavicon =
-    eruditConfig.site?.favicon?.default || eruditAsset('favicon/default.svg');
-
-export function useFavicon() {
-    return useState('favicon', () => defaultFavicon);
-}
+import eruditConfig from '#erudit/config';
+
+export const defaultFavicon =
+    eruditConfig.site?.favicon?.default || eruditAsset('favicon/default.svg');
+
+export function useFavicon() {
+    return useState('favicon', () => defaultFavicon);
+}

package/app/composables/formatText.ts

@@ -1,99 +1,99 @@
-import eruditConfig from '#erudit/config';
-
-export interface FormatState {
-    quoteOpen: boolean;
-}
-
-const defaultFormatState: FormatState = {
-    quoteOpen: false,
-};
-
-export type FormatFunction = (text: string, state?: FormatState) => string;
-export type FormatterFunction = (text: string, state: FormatState) => string;
-
-let formatFunction: FormatFunction;
-
-export function useFormatText() {
-    if (!formatFunction) {
-        const language = eruditConfig?.language;
-        formatFunction = createFormatFunction(language);
-    }
-
-    return formatFunction;
-}
-
-function createFormatFunction(language?: string): FormatFunction {
-    const formatters: FormatterFunction[] = [];
-
-    //
-    // Em Dashes
-    //
-
-    formatters.push((text) => text.replace(/(^| )--($| )/gm, '$1—$2'));
-
-    //
-    // Quotes
-    //
-
-    {
-        const quoteSymbols: [string, string] = (() => {
-            switch (language) {
-                case 'ru':
-                    return ['«', '»'];
-                default:
-                    return ['“', '”'];
-            }
-        })();
-
-        formatters.push((text, state) => {
-            return text.replaceAll(/"/gm, () => {
-                return (state.quoteOpen = !state.quoteOpen)
-                    ? quoteSymbols[0]
-                    : quoteSymbols[1];
-            });
-        });
-    }
-
-    //
-    // Ellipsis
-    //
-
-    formatters.push((text) => text.replace(/\.\.\./gm, '…'));
-
-    //
-    // Language specific formatters
-    //
-
-    if (language === 'ru') formatters.push(ruStickyPrepositions);
-
-    //
-    //
-    //
-
-    function formatText(
-        text: string,
-        state: FormatState = defaultFormatState,
-    ): string {
-        if (!text) return text;
-
-        for (const formatter of formatters) text = formatter(text, state);
-
-        return text;
-    }
-
-    return formatText;
-}
-
-//
-//
-//
-
-/**
- * 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',
-    );
-}
+import eruditConfig from '#erudit/config';
+
+export interface FormatState {
+    quoteOpen: boolean;
+}
+
+const defaultFormatState: FormatState = {
+    quoteOpen: false,
+};
+
+export type FormatFunction = (text: string, state?: FormatState) => string;
+export type FormatterFunction = (text: string, state: FormatState) => string;
+
+let formatFunction: FormatFunction;
+
+export function useFormatText() {
+    if (!formatFunction) {
+        const language = eruditConfig?.language;
+        formatFunction = createFormatFunction(language);
+    }
+
+    return formatFunction;
+}
+
+function createFormatFunction(language?: string): FormatFunction {
+    const formatters: FormatterFunction[] = [];
+
+    //
+    // Em Dashes
+    //
+
+    formatters.push((text) => text.replace(/(^| )--($| )/gm, '$1—$2'));
+
+    //
+    // Quotes
+    //
+
+    {
+        const quoteSymbols: [string, string] = (() => {
+            switch (language) {
+                case 'ru':
+                    return ['«', '»'];
+                default:
+                    return ['“', '”'];
+            }
+        })();
+
+        formatters.push((text, state) => {
+            return text.replaceAll(/"/gm, () => {
+                return (state.quoteOpen = !state.quoteOpen)
+                    ? quoteSymbols[0]
+                    : quoteSymbols[1];
+            });
+        });
+    }
+
+    //
+    // Ellipsis
+    //
+
+    formatters.push((text) => text.replace(/\.\.\./gm, '…'));
+
+    //
+    // Language specific formatters
+    //
+
+    if (language === 'ru') formatters.push(ruStickyPrepositions);
+
+    //
+    //
+    //
+
+    function formatText(
+        text: string,
+        state: FormatState = defaultFormatState,
+    ): string {
+        if (!text) return text;
+
+        for (const formatter of formatters) text = formatter(text, state);
+
+        return text;
+    }
+
+    return formatText;
+}
+
+//
+//
+//
+
+/**
+ * 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/composables/majorPane.ts

@@ -1,60 +1,60 @@
-import type { Component } from 'vue';
-
-import type { MyIconName } from '#my-icons';
-
-import Nav from '@app/components/aside/major/panes/nav/Nav.vue';
-import Pages from '@app/components/aside/major/panes/Pages.vue';
-import Search from '@app/components/aside/major/panes/Search.vue';
-import Language from '@app/components/aside/major/panes/Language.vue';
-import Other from '@app/components/aside/major/panes/other/Other.vue';
-
-interface MajorPane {
-    icon: MyIconName;
-    phrase: EruditPhraseId;
-    content: Component;
-}
-
-function definePane<TPane extends MajorPane>(pane: TPane) {
-    return pane;
-}
-
-export const majorPanes = {
-    index: definePane({ icon: 'book', phrase: 'index', content: Nav }),
-    pages: definePane({ icon: 'file-lines', phrase: 'pages', content: Pages }),
-    search: definePane({ icon: 'search', phrase: 'search', content: Search }),
-    language: definePane({
-        icon: 'globe',
-        phrase: 'language',
-        content: Language,
-    }),
-    other: definePane({
-        icon: 'ellipsis-vertical',
-        phrase: 'other',
-        content: Other,
-    }),
-};
-
-function getPaneOrder(paneKey: MajorPaneKey) {
-    return Object.keys(majorPanes).indexOf(paneKey);
-}
-
-export type MajorPaneKey = keyof typeof majorPanes;
-
-export function useMajorPane() {
-    const route = useRoute();
-
-    const activePane = useState<MajorPaneKey>('major-pane', () => {
-        switch (route.path) {
-            case '/members':
-                return 'pages';
-            default:
-                return 'index';
-        }
-    });
-
-    return {
-        panes: majorPanes,
-        activePane,
-        getPaneOrder,
-    };
-}
+import type { Component } from 'vue';
+
+import type { MyIconName } from '#my-icons';
+
+import Nav from '@app/components/aside/major/panes/nav/Nav.vue';
+import Pages from '@app/components/aside/major/panes/Pages.vue';
+import Search from '@app/components/aside/major/panes/Search.vue';
+import Language from '@app/components/aside/major/panes/Language.vue';
+import Other from '@app/components/aside/major/panes/other/Other.vue';
+
+interface MajorPane {
+    icon: MyIconName;
+    phrase: EruditPhraseId;
+    content: Component;
+}
+
+function definePane<TPane extends MajorPane>(pane: TPane) {
+    return pane;
+}
+
+export const majorPanes = {
+    index: definePane({ icon: 'book', phrase: 'index', content: Nav }),
+    pages: definePane({ icon: 'file-lines', phrase: 'pages', content: Pages }),
+    search: definePane({ icon: 'search', phrase: 'search', content: Search }),
+    language: definePane({
+        icon: 'globe',
+        phrase: 'language',
+        content: Language,
+    }),
+    other: definePane({
+        icon: 'ellipsis-vertical',
+        phrase: 'other',
+        content: Other,
+    }),
+};
+
+function getPaneOrder(paneKey: MajorPaneKey) {
+    return Object.keys(majorPanes).indexOf(paneKey);
+}
+
+export type MajorPaneKey = keyof typeof majorPanes;
+
+export function useMajorPane() {
+    const route = useRoute();
+
+    const activePane = useState<MajorPaneKey>('major-pane', () => {
+        switch (route.path) {
+            case '/members':
+                return 'pages';
+            default:
+                return 'index';
+        }
+    });
+
+    return {
+        panes: majorPanes,
+        activePane,
+        getPaneOrder,
+    };
+}

package/app/composables/phrases.ts

@@ -1,65 +1,65 @@
-type PhraseCaller<T extends EruditPhraseId[]> = {
-    [K in T[number]]: EruditPhrases[K];
-};
-
-const payloadKey = 'language';
-
-interface LanguagePayload {
-    strPhrases: Partial<Record<EruditPhraseId, string>>;
-    strFunctions: Record<string, string>;
-}
-
-const functions: Record<string, Function> = {};
-const functionPhrases: Record<string, Function> = {};
-
-const phraseApiRoute = (phraseId: EruditPhraseId) =>
-    `/api/language/phrase/${phraseId}`;
-const functionsApiRoute = '/api/language/functions';
-
-export function usePhrases<T extends EruditPhraseId[]>(
-    ...phraseIds: T
-): Promise<PhraseCaller<T>> {
-    const nuxt = useNuxtApp();
-    const payload: LanguagePayload =
-        (nuxt.static.data[payloadKey] ||=
-        nuxt.payload.data[payloadKey] ||=
-            {});
-
-    const prepareFunctionsPromise = prepareFunctions(payload);
-
-    return (async () => {
-        await prepareFunctionsPromise;
-
-        payload.strPhrases ||= {};
-        const phraseCaller: any = {};
-
-        for (const phraseId of phraseIds) {
-            const apiRoute = phraseApiRoute(phraseId);
-            const strPhrase = (payload.strPhrases[phraseId] ||= (await $fetch(
-                apiRoute,
-                { responseType: 'text' },
-            )) as string);
-
-            if (strPhrase.startsWith('~!~FUNC~!~')) {
-                const strFunction = strPhrase.replace('~!~FUNC~!~', '');
-                functionPhrases[phraseId] ||= new Function(strFunction).bind(
-                    functions,
-                )();
-                phraseCaller[phraseId] = functionPhrases[phraseId];
-            } else {
-                phraseCaller[phraseId] = strPhrase;
-            }
-        }
-
-        return phraseCaller as PhraseCaller<T>;
-    })();
-}
-
-async function prepareFunctions(payload: LanguagePayload) {
-    if (payload?.strFunctions) return;
-
-    payload.strFunctions = await $fetch(functionsApiRoute);
-
-    for (const [funcName, strFunc] of Object.entries(payload.strFunctions))
-        functions[funcName] = new Function(strFunc)();
-}
+type PhraseCaller<T extends EruditPhraseId[]> = {
+    [K in T[number]]: EruditPhrases[K];
+};
+
+const payloadKey = 'language';
+
+interface LanguagePayload {
+    strPhrases: Partial<Record<EruditPhraseId, string>>;
+    strFunctions: Record<string, string>;
+}
+
+const functions: Record<string, Function> = {};
+const functionPhrases: Record<string, Function> = {};
+
+const phraseApiRoute = (phraseId: EruditPhraseId) =>
+    `/api/language/phrase/${phraseId}`;
+const functionsApiRoute = '/api/language/functions';
+
+export function usePhrases<T extends EruditPhraseId[]>(
+    ...phraseIds: T
+): Promise<PhraseCaller<T>> {
+    const nuxt = useNuxtApp();
+    const payload: LanguagePayload =
+        (nuxt.static.data[payloadKey] ||=
+        nuxt.payload.data[payloadKey] ||=
+            {});
+
+    const prepareFunctionsPromise = prepareFunctions(payload);
+
+    return (async () => {
+        await prepareFunctionsPromise;
+
+        payload.strPhrases ||= {};
+        const phraseCaller: any = {};
+
+        for (const phraseId of phraseIds) {
+            const apiRoute = phraseApiRoute(phraseId);
+            const strPhrase = (payload.strPhrases[phraseId] ||= (await $fetch(
+                apiRoute,
+                { responseType: 'text' },
+            )) as string);
+
+            if (strPhrase.startsWith('~!~FUNC~!~')) {
+                const strFunction = strPhrase.replace('~!~FUNC~!~', '');
+                functionPhrases[phraseId] ||= new Function(strFunction).bind(
+                    functions,
+                )();
+                phraseCaller[phraseId] = functionPhrases[phraseId];
+            } else {
+                phraseCaller[phraseId] = strPhrase;
+            }
+        }
+
+        return phraseCaller as PhraseCaller<T>;
+    })();
+}
+
+async function prepareFunctions(payload: LanguagePayload) {
+    if (payload?.strFunctions) return;
+
+    payload.strFunctions = await $fetch(functionsApiRoute);
+
+    for (const [funcName, strFunc] of Object.entries(payload.strFunctions))
+        functions[funcName] = new Function(strFunc)();
+}

package/app/composables/theme.ts

@@ -1,29 +1,29 @@
-const themes = ['auto', 'light', 'dark'] as const;
-
-export type Theme = (typeof themes)[number];
-export type BinaryTheme = 'light' | 'dark';
-
-export function useTheme() {
-    const theme = useState<Theme>('theme', () => {
-        return localStorage.getItem('theme') ?? ('auto' as any);
-    });
-
-    const binaryTheme = computed(() => {
-        return theme.value === 'auto'
-            ? window.matchMedia('(prefers-color-scheme: dark)').matches
-                ? 'dark'
-                : 'light'
-            : theme.value;
-    });
-
-    const cycle = () => {
-        theme.value =
-            themes[(themes.indexOf(theme.value) + 1) % themes.length]!;
-    };
-
-    return {
-        theme,
-        binaryTheme,
-        cycle,
-    };
-}
+const themes = ['auto', 'light', 'dark'] as const;
+
+export type Theme = (typeof themes)[number];
+export type BinaryTheme = 'light' | 'dark';
+
+export function useTheme() {
+    const theme = useState<Theme>('theme', () => {
+        return localStorage.getItem('theme') ?? ('auto' as any);
+    });
+
+    const binaryTheme = computed(() => {
+        return theme.value === 'auto'
+            ? window.matchMedia('(prefers-color-scheme: dark)').matches
+                ? 'dark'
+                : 'light'
+            : theme.value;
+    });
+
+    const cycle = () => {
+        theme.value =
+            themes[(themes.indexOf(theme.value) + 1) % themes.length]!;
+    };
+
+    return {
+        theme,
+        binaryTheme,
+        cycle,
+    };
+}