erudit 2.0.0-dev.8 → 3.0.0-dev.1

package/app/scripts/aside/index.ts

@@ -1,59 +1,59 @@
-// TODO: Push this shit into <SiteAside /> or make composable or make something...
-
-export enum AsideType {
-    Major = 'major',
-    Minor = 'minor',
-}
-
-export const switchVisible = ref<boolean>(true);
-export const forcedAside = ref<AsideType>();
-
-export const clickTargets: {
-    major: HTMLElement[];
-    minor: HTMLElement[];
-} = {
-    major: [],
-    minor: [],
-};
-
-if (import.meta.client) {
-    //
-    // Switch visibility logic
-    //
-
-    let lastY = window.scrollY;
-    let sumDelta = 0;
-    let scrollTimeout: any;
-
-    window.addEventListener('scroll', () => {
-        const currentY = window.scrollY;
-        const delta = currentY - lastY;
-
-        sumDelta += delta;
-
-        switchVisible.value = sumDelta <= -1;
-
-        lastY = currentY;
-
-        clearTimeout(scrollTimeout);
-        scrollTimeout = setTimeout(() => {
-            sumDelta = 0;
-        }, 200);
-    });
-
-    //
-    // Unpin forced asides when click outside logic
-    //
-
-    window.addEventListener('click', (e) => {
-        if (forcedAside.value) {
-            const toIgnoreTargets = clickTargets[forcedAside.value]; // Ignore currently pinned aside elements
-
-            for (const target of toIgnoreTargets)
-                if (target.contains(e.target as Element)) return;
-
-            forcedAside.value = undefined;
-            switchVisible.value = true;
-        }
-    });
-}
+// TODO: Push this shit into <SiteAside /> or make composable or make something...
+
+export enum AsideType {
+    Major = 'major',
+    Minor = 'minor',
+}
+
+export const switchVisible = ref<boolean>(true);
+export const forcedAside = ref<AsideType>();
+
+export const clickTargets: {
+    major: HTMLElement[];
+    minor: HTMLElement[];
+} = {
+    major: [],
+    minor: [],
+};
+
+if (import.meta.client) {
+    //
+    // Switch visibility logic
+    //
+
+    let lastY = window.scrollY;
+    let sumDelta = 0;
+    let scrollTimeout: any;
+
+    window.addEventListener('scroll', () => {
+        const currentY = window.scrollY;
+        const delta = currentY - lastY;
+
+        sumDelta += delta;
+
+        switchVisible.value = sumDelta <= -1;
+
+        lastY = currentY;
+
+        clearTimeout(scrollTimeout);
+        scrollTimeout = setTimeout(() => {
+            sumDelta = 0;
+        }, 200);
+    });
+
+    //
+    // Unpin forced asides when click outside logic
+    //
+
+    window.addEventListener('click', (e) => {
+        if (forcedAside.value) {
+            const toIgnoreTargets = clickTargets[forcedAside.value]; // Ignore currently pinned aside elements
+
+            for (const target of toIgnoreTargets)
+                if (target.contains(e.target as Element)) return;
+
+            forcedAside.value = undefined;
+            switchVisible.value = true;
+        }
+    });
+}

package/app/scripts/aside/major/nav.ts

@@ -1,26 +1,26 @@
-import type { InjectionKey, ShallowRef } from 'vue';
-import type { FrontNav } from '@shared/frontNav';
-
-export const insideNavBook = ref(false);
-export const navBookId = ref<string>();
-
-export const navBookVisible = computed(() => {
-    return insideNavBook.value && navBookId.value;
-});
-
-type AsideMajorNav = {
-    booksIds: string[];
-    globalNav: FrontNav;
-};
-
-export function getAsideMajorNavPayload() {
-    const key = 'aside-major-nav';
-    const nuxtApp = useNuxtApp();
-    return (nuxtApp.static.data[key] ||= nuxtApp.payload.data[key] ||=
-        {}) as AsideMajorNav;
-}
-
-export type NavStateValue = ShallowRef<null | 'active' | 'activePart'>;
-export type NavState = { [contentId: string]: NavStateValue };
-
-export const navStateKey = Symbol() as InjectionKey<ShallowRef<NavState>>;
+import type { InjectionKey, ShallowRef } from 'vue';
+import type { FrontNav } from '@shared/frontNav';
+
+export const insideNavBook = ref(false);
+export const navBookId = ref<string>();
+
+export const navBookVisible = computed(() => {
+    return insideNavBook.value && navBookId.value;
+});
+
+type AsideMajorNav = {
+    booksIds: string[];
+    globalNav: FrontNav;
+};
+
+export function getAsideMajorNavPayload() {
+    const key = 'aside-major-nav';
+    const nuxtApp = useNuxtApp();
+    return (nuxtApp.static.data[key] ||= nuxtApp.payload.data[key] ||=
+        {}) as AsideMajorNav;
+}
+
+export type NavStateValue = ShallowRef<null | 'active' | 'activePart'>;
+export type NavState = { [contentId: string]: NavStateValue };
+
+export const navStateKey = Symbol() as InjectionKey<ShallowRef<NavState>>;

package/app/scripts/aside/minor/state.ts

@@ -1,37 +1,37 @@
-import type { InjectionKey, ShallowRef } from 'vue';
-import type {
-    AsideMinorData,
-    AsideMinorNews,
-    AsideMinorTopic,
-    AsideMinorType,
-} from '@shared/asideMinor';
-
-export const asideMinorKey = Symbol() as InjectionKey<
-    ShallowRef<AsideMinorData>
->;
-
-export function injectAsideData<T extends AsideMinorData>() {
-    return inject(asideMinorKey) as ShallowRef<T>;
-}
-
-// export function injectTopicData(): Ref<AsideMinorTopic>
-// {
-//     const dataRef = inject(asideMinorKey);
-//     return createTypeSafeDataComputed(dataRef, 'topic') as any;
-// }
-
-// export function injectNewsData(): Ref<AsideMinorNews>
-// {
-//     const dataRef = inject(asideMinorKey);
-//     return createTypeSafeDataComputed(dataRef, 'news') as any;
-// }
-
-// function createTypeSafeDataComputed(dataRef: Ref<AsideMinorData>, targetType: AsideMinorType)
-// {
-//     return computed(() => {
-//         if (dataRef.value.type !== targetType)
-//             throw new Error(`Aside minor data type mismatch! Expected "${targetType}", got "${dataRef.value.type}"!`);
-
-//         return dataRef.value;
-//     });
-// }
+import type { InjectionKey, ShallowRef } from 'vue';
+import type {
+    AsideMinorData,
+    AsideMinorNews,
+    AsideMinorTopic,
+    AsideMinorType,
+} from '@shared/asideMinor';
+
+export const asideMinorKey = Symbol() as InjectionKey<
+    ShallowRef<AsideMinorData>
+>;
+
+export function injectAsideData<T extends AsideMinorData>() {
+    return inject(asideMinorKey) as ShallowRef<T>;
+}
+
+// export function injectTopicData(): Ref<AsideMinorTopic>
+// {
+//     const dataRef = inject(asideMinorKey);
+//     return createTypeSafeDataComputed(dataRef, 'topic') as any;
+// }
+
+// export function injectNewsData(): Ref<AsideMinorNews>
+// {
+//     const dataRef = inject(asideMinorKey);
+//     return createTypeSafeDataComputed(dataRef, 'news') as any;
+// }
+
+// function createTypeSafeDataComputed(dataRef: Ref<AsideMinorData>, targetType: AsideMinorType)
+// {
+//     return computed(() => {
+//         if (dataRef.value.type !== targetType)
+//             throw new Error(`Aside minor data type mismatch! Expected "${targetType}", got "${dataRef.value.type}"!`);
+
+//         return dataRef.value;
+//     });
+// }

package/app/scripts/aside/minor/topic.ts

@@ -1,3 +1,3 @@
-import type { Location } from '@shared/location';
-
-export const topicLocation = ref<Location>();
+import type { Location } from '@shared/location';
+
+export const topicLocation = ref<Location>();

package/app/scripts/preview/build.ts

@@ -1,84 +1,73 @@
-import { PreviewDataType, type PreviewData } from './data';
-import { PreviewRequestType, type PreviewRequest } from './request';
-
-import { buildGenericLink } from './data/genericLink';
-import { buildPageLink } from './data/pageLink';
-import { buildUnique } from './data/unique';
-import { createPreviewError } from './data/alert';
-import { PreviewThemeName } from './state';
-
-const builders = [
-    buildGenericLink,
-    buildPageLink,
-    buildUnique,
-];
-
-export async function buildPreviewData(request: PreviewRequest): Promise<PreviewData>
-{
-    if (request.type === PreviewRequestType.Data)
-        return request.data;
-
-    if (request.type === PreviewRequestType.MissingElement)
-    {
-        if (request.hashMismatch)
-        {
-            const phrase = await usePhrases(
-                'preview_missing_title',
-                'preview_missing_explain_mismatch',
-                'element_id',
-                'current_page_hash',
-                'expected_page_hash',
-            );
-
-            return createPreviewError({
-                title: phrase.preview_missing_title,
-                message: phrase.preview_missing_explain_mismatch,
-                pre: `${phrase.element_id}: ${request.elementId}\n${phrase.current_page_hash}: ${request.hashMismatch.current}\n${phrase.expected_page_hash}: ${request.hashMismatch.expected}`,
-            });
-        }
-        else
-        {
-            const phrase = await usePhrases(
-                'preview_missing_title',
-                'preview_missing_explain',
-                'element_id',
-            );
-
-            return createPreviewError({
-                title: phrase.preview_missing_title,
-                message: phrase.preview_missing_explain,
-                pre: `${phrase.element_id}: ${request.elementId}`,
-            });
-        }
-    }
-
-    if (request.type === PreviewRequestType.HashMismatch)
-    {
-        const phrase = await usePhrases(
-            'preview_hash_mismatch_title',
-            'preview_hash_mismatch_explain',
-            'current_page_hash',
-            'expected_page_hash',
-        );
-
-        return {
-            type:       PreviewDataType.Alert,
-            theme:      PreviewThemeName.Warn,
-            title:      phrase.preview_hash_mismatch_title,
-            message:    phrase.preview_hash_mismatch_explain,
-            pre:        `${phrase.current_page_hash}: ${request.currentHash}\n${phrase.expected_page_hash}: ${request.expectedHash}`,
-        };
-    }
-
-    for (const build of builders)
-    {
-        const result = await build(request);
-        if (result)
-            return result;
-    }
-
-    throw createPreviewError({
-        message: `Unable to build preview data for request!`,
-        pre: JSON.stringify(request, null, 4),
-    });
-}
+import { PreviewDataType, type PreviewData } from './data';
+import { PreviewRequestType, type PreviewRequest } from './request';
+
+import { buildGenericLink } from './data/genericLink';
+import { buildPageLink } from './data/pageLink';
+import { buildUnique } from './data/unique';
+import { createPreviewError } from './data/alert';
+import { PreviewThemeName } from './state';
+
+const builders = [buildGenericLink, buildPageLink, buildUnique];
+
+export async function buildPreviewData(
+    request: PreviewRequest,
+): Promise<PreviewData> {
+    if (request.type === PreviewRequestType.Data) return request.data;
+
+    if (request.type === PreviewRequestType.MissingElement) {
+        if (request.hashMismatch) {
+            const phrase = await usePhrases(
+                'preview_missing_title',
+                'preview_missing_explain_mismatch',
+                'element_id',
+                'current_page_hash',
+                'expected_page_hash',
+            );
+
+            return createPreviewError({
+                title: phrase.preview_missing_title,
+                message: phrase.preview_missing_explain_mismatch,
+                pre: `${phrase.element_id}: ${request.elementId}\n${phrase.current_page_hash}: ${request.hashMismatch.current}\n${phrase.expected_page_hash}: ${request.hashMismatch.expected}`,
+            });
+        } else {
+            const phrase = await usePhrases(
+                'preview_missing_title',
+                'preview_missing_explain',
+                'element_id',
+            );
+
+            return createPreviewError({
+                title: phrase.preview_missing_title,
+                message: phrase.preview_missing_explain,
+                pre: `${phrase.element_id}: ${request.elementId}`,
+            });
+        }
+    }
+
+    if (request.type === PreviewRequestType.HashMismatch) {
+        const phrase = await usePhrases(
+            'preview_hash_mismatch_title',
+            'preview_hash_mismatch_explain',
+            'current_page_hash',
+            'expected_page_hash',
+        );
+
+        return {
+            type: PreviewDataType.Alert,
+            theme: PreviewThemeName.Warn,
+            title: phrase.preview_hash_mismatch_title,
+            message: phrase.preview_hash_mismatch_explain,
+            pre: `${phrase.current_page_hash}: ${request.currentHash}\n${phrase.expected_page_hash}: ${request.expectedHash}`,
+        };
+    }
+
+    for (const build of builders) {
+        const result = await build(request);
+        if (result) return result;
+    }
+
+    throw createPreviewError({
+        message: `Unable to build preview data for request!`,
+        pre: JSON.stringify(request, null, 4),
+    });
+}

package/app/scripts/preview/data/alert.ts

@@ -1,19 +1,19 @@
-import { PreviewDataType, type PreviewDataBase } from '../data';
-import { PreviewThemeName } from '../state';
-
-export type AlertData = Partial<{
-    theme: PreviewThemeName;
-    title: string;
-    message: string;
-    pre: string;
-}>;
-
-export type PreviewDataAlert = PreviewDataBase & AlertData;
-
-export function createPreviewError(alertData: AlertData): PreviewDataAlert {
-    return {
-        type: PreviewDataType.Alert,
-        theme: PreviewThemeName.Error,
-        ...alertData,
-    };
-}
+import { PreviewDataType, type PreviewDataBase } from '../data';
+import { PreviewThemeName } from '../state';
+
+export type AlertData = Partial<{
+    theme: PreviewThemeName;
+    title: string;
+    message: string;
+    pre: string;
+}>;
+
+export type PreviewDataAlert = PreviewDataBase & AlertData;
+
+export function createPreviewError(alertData: AlertData): PreviewDataAlert {
+    return {
+        type: PreviewDataType.Alert,
+        theme: PreviewThemeName.Error,
+        ...alertData,
+    };
+}

package/app/scripts/preview/data/custom.ts

@@ -1,8 +1,8 @@
-import type { PreviewDataBase, PreviewDataType } from '../data';
-import type { PreviewFooter } from '../footer';
-
-export interface PreviewDataCustom extends PreviewDataBase {
-    type: PreviewDataType.Custom;
-    message: string;
-    footer?: PreviewFooter;
-}
+import type { PreviewDataBase, PreviewDataType } from '../data';
+import type { PreviewFooter } from '../footer';
+
+export interface PreviewDataCustom extends PreviewDataBase {
+    type: PreviewDataType.Custom;
+    message: string;
+    footer?: PreviewFooter;
+}

package/app/scripts/preview/data/genericLink.ts

@@ -1,24 +1,24 @@
-import { PreviewDataType, type PreviewDataBase } from '../data';
-import { PreviewRequestType, type PreviewRequest } from '../request';
-
-export interface PreviewDataGenericLink extends PreviewDataBase {
-    type: PreviewDataType.GenericLink;
-    external: boolean;
-    href: string;
-}
-
-export async function buildGenericLink(
-    request: PreviewRequest,
-): Promise<PreviewDataGenericLink> {
-    if (request.type !== PreviewRequestType.Link) return;
-
-    const { linkTarget } = request;
-
-    if (!['external', 'absolute'].includes(linkTarget.type)) return;
-
-    return {
-        type: PreviewDataType.GenericLink,
-        external: linkTarget.type === 'external',
-        href: linkTarget.href,
-    };
-}
+import { PreviewDataType, type PreviewDataBase } from '../data';
+import { PreviewRequestType, type PreviewRequest } from '../request';
+
+export interface PreviewDataGenericLink extends PreviewDataBase {
+    type: PreviewDataType.GenericLink;
+    external: boolean;
+    href: string;
+}
+
+export async function buildGenericLink(
+    request: PreviewRequest,
+): Promise<PreviewDataGenericLink> {
+    if (request.type !== PreviewRequestType.Link) return;
+
+    const { linkTarget } = request;
+
+    if (!['external', 'absolute'].includes(linkTarget.type)) return;
+
+    return {
+        type: PreviewDataType.GenericLink,
+        external: linkTarget.type === 'external',
+        href: linkTarget.href,
+    };
+}

package/app/scripts/preview/data/pageLink.ts

@@ -1,20 +1,20 @@
-import { PreviewDataType, type PreviewDataBase } from '../data';
-import { PreviewRequestType, type PreviewRequest } from '../request';
-import type { PreviewFooter } from '../footer';
-
-export interface PreviewDataPageLink extends PreviewDataBase {
-    type: PreviewDataType.PageLink;
-    footer: PreviewFooter;
-}
-
-export async function buildPageLink(
-    request: PreviewRequest,
-): Promise<PreviewDataPageLink> {
-    if (request.type !== PreviewRequestType.Link) return;
-
-    const { linkTarget } = request;
-
-    if (linkTarget.type !== 'page') return;
-
-    return await $fetch(`/api/preview/page${linkTarget._href}`);
-}
+import { PreviewDataType, type PreviewDataBase } from '../data';
+import { PreviewRequestType, type PreviewRequest } from '../request';
+import type { PreviewFooter } from '../footer';
+
+export interface PreviewDataPageLink extends PreviewDataBase {
+    type: PreviewDataType.PageLink;
+    footer: PreviewFooter;
+}
+
+export async function buildPageLink(
+    request: PreviewRequest,
+): Promise<PreviewDataPageLink> {
+    if (request.type !== PreviewRequestType.Link) return;
+
+    const { linkTarget } = request;
+
+    if (linkTarget.type !== 'page') return;
+
+    return await $fetch(`/api/preview/page${linkTarget._href}`);
+}