erudit 3.0.0-dev.4 → 3.0.0-dev.6

package/app/components/tree/TreeContainer.vue

@@ -1,11 +1,11 @@
-<template>
-    <div :class="$style.treeContainer">
-        <slot></slot>
-    </div>
-</template>
-
-<style lang="scss" module>
-.treeContainer {
-    padding: calc(var(--gap) / 2) 0;
-}
-</style>
+<template>
+    <div :class="$style.treeContainer">
+        <slot></slot>
+    </div>
+</template>
+
+<style lang="scss" module>
+.treeContainer {
+    padding: calc(var(--gap) / 2) 0;
+}
+</style>

package/app/components/tree/TreeItem.vue

@@ -1,89 +1,89 @@
-<script lang="ts" setup>
-import type { MyIconName } from '#my-icons';
-
-defineProps<{
-    label: string;
-    icon?: MyIconName;
-    svg?: string;
-    level?: number;
-    link?: string;
-    active?: boolean;
-    accent?: boolean;
-}>();
-</script>
-
-<template>
-    <NuxtLink
-        :prefetch="false"
-        :to="link"
-        :class="[
-            $style.treeItem,
-            active && $style.active,
-            accent && $style.accent,
-        ]"
-        :style="{ ['--_level']: level ?? 0 }"
-    >
-        <MyIcon v-if="icon" :class="$style.icon" :name="icon" />
-        <MyRuntimeIcon v-else :class="$style.icon" name="tree-item-icon" :svg />
-        <div :class="$style.main">{{ label }}</div>
-        <div v-if="$slots.default" :class="$style.after">
-            <slot></slot>
-        </div>
-    </NuxtLink>
-</template>
-
-<style lang="scss" module>
-.treeItem {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: calc(var(--gap) / 1.6);
-    padding: calc(var(--gap) / 2) var(--gap);
-    padding-left: calc((var(--_level) + 1) * var(--gap));
-    font-size: 0.95em;
-    color: var(--textMuted);
-    text-decoration: none;
-    cursor: pointer;
-
-    @include transition(background);
-
-    &:hover {
-        background: var(--bgAccent);
-        .icon,
-        .main {
-            color: var(--text);
-        }
-    }
-
-    &.active {
-        .icon,
-        .main {
-            color: var(--brand);
-        }
-    }
-    &.accent {
-        .icon,
-        .main {
-            color: var(--text);
-        }
-    }
-
-    .icon,
-    .main {
-        @include transition(color);
-    }
-
-    .main {
-        flex: 1;
-    }
-
-    .icon,
-    .after {
-        flex-shrink: 0;
-    }
-
-    .icon {
-        font-size: 16px;
-    }
-}
-</style>
+<script lang="ts" setup>
+import type { MyIconName } from '#my-icons';
+
+defineProps<{
+    label: string;
+    icon?: MyIconName;
+    svg?: string;
+    level?: number;
+    link?: string;
+    active?: boolean;
+    accent?: boolean;
+}>();
+</script>
+
+<template>
+    <NuxtLink
+        :prefetch="false"
+        :to="link"
+        :class="[
+            $style.treeItem,
+            active && $style.active,
+            accent && $style.accent,
+        ]"
+        :style="{ ['--_level']: level ?? 0 }"
+    >
+        <MyIcon v-if="icon" :class="$style.icon" :name="icon" />
+        <MyRuntimeIcon v-else :class="$style.icon" name="tree-item-icon" :svg />
+        <div :class="$style.main">{{ label }}</div>
+        <div v-if="$slots.default" :class="$style.after">
+            <slot></slot>
+        </div>
+    </NuxtLink>
+</template>
+
+<style lang="scss" module>
+.treeItem {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: calc(var(--gap) / 1.6);
+    padding: calc(var(--gap) / 2) var(--gap);
+    padding-left: calc((var(--_level) + 1) * var(--gap));
+    font-size: 0.95em;
+    color: var(--textMuted);
+    text-decoration: none;
+    cursor: pointer;
+
+    @include transition(background);
+
+    &:hover {
+        background: var(--bgAccent);
+        .icon,
+        .main {
+            color: var(--text);
+        }
+    }
+
+    &.active {
+        .icon,
+        .main {
+            color: var(--brand);
+        }
+    }
+    &.accent {
+        .icon,
+        .main {
+            color: var(--text);
+        }
+    }
+
+    .icon,
+    .main {
+        @include transition(color);
+    }
+
+    .main {
+        flex: 1;
+    }
+
+    .icon,
+    .after {
+        flex-shrink: 0;
+    }
+
+    .icon {
+        font-size: 16px;
+    }
+}
+</style>

package/app/composables/bitran.ts

@@ -1,127 +1,129 @@
-import eruditConfig from '#erudit/config';
-import bitranConfig from '#erudit/client/bitran';
-
-import {
-    createPhraseCaller,
-    getDefaultRenderers,
-    getElementIcon,
-    type ElementVueRenderers,
-} from '@bitran-js/renderer-vue';
-import {
-    defineBitranTranspiler,
-    type BitranTranspiler,
-    type ElementTranspilers,
-} from '@bitran-js/transpiler';
-import { aliasesName } from '@erudit-js/bitran-elements/aliases/shared';
-import { aliasesTranspiler } from '@erudit-js/bitran-elements/aliases/transpiler';
-import { headingName } from '@erudit-js/bitran-elements/heading/shared';
-import { headingTranspiler } from '@erudit-js/bitran-elements/heading/transpiler';
-import { includeName } from '@erudit-js/bitran-elements/include/shared';
-import { includeTranspiler } from '@erudit-js/bitran-elements/include/transpiler';
-import { linkName } from '@erudit/shared/bitran/link/shared';
-import { linkTranspiler } from '@erudit/shared/bitran/link/transpiler';
-import { aliasesRenderer } from '@erudit-js/bitran-elements/aliases/renderer';
-import { headingRenderer } from '@erudit-js/bitran-elements/heading/renderer';
-import { includeRenderer } from '@erudit-js/bitran-elements/include/renderer';
-import { linkRenderer } from '@erudit/shared/bitran/link/renderer';
-
-let bitranTranspiler!: BitranTranspiler;
-let bitranRenderers!: ElementVueRenderers;
-
-//
-// Transpiler
-//
-
-export async function useBitranTranspiler() {
-    if (bitranTranspiler) return bitranTranspiler;
-
-    const projectTranspilers = await getProjectTranspilers();
-
-    const defaultTranspilers = {
-        [aliasesName]: aliasesTranspiler,
-        [includeName]: includeTranspiler,
-        [headingName]: headingTranspiler,
-        [linkName]: linkTranspiler,
-    };
-
-    bitranTranspiler = defineBitranTranspiler({
-        ...projectTranspilers,
-        ...defaultTranspilers,
-    });
-
-    return bitranTranspiler;
-}
-
-async function getProjectTranspilers(): Promise<ElementTranspilers> {
-    const bitranElements = bitranConfig.elements;
-
-    if (!bitranElements) return {};
-
-    const projectTranspilers: ElementTranspilers = {};
-    for (const [name, bitranElement] of Object.entries(bitranElements))
-        projectTranspilers[name] = await bitranElement.transpiler();
-
-    return projectTranspilers;
-}
-
-//
-// Renderers
-//
-
-export async function useBitranRenderers() {
-    if (bitranRenderers) return bitranRenderers;
-
-    const projectRenderers = await getProjectRenderers();
-
-    const defaultRenderers = {
-        [aliasesName]: aliasesRenderer,
-        [includeName]: includeRenderer,
-        [headingName]: headingRenderer,
-        [linkName]: linkRenderer,
-    };
-
-    // @ts-ignore
-    bitranRenderers = {
-        ...projectRenderers,
-        ...defaultRenderers,
-    };
-
-    return bitranRenderers!;
-}
-
-async function getProjectRenderers() {
-    const bitranElements = bitranConfig.elements;
-
-    if (!bitranElements) return {};
-
-    const projectRenderers: ElementVueRenderers = {};
-    for (const [name, bitranElement] of Object.entries(bitranElements))
-        projectRenderers[name] = await bitranElement.renderer();
-
-    return projectRenderers;
-}
-
-//
-// Utils
-//
-
-export async function useBitranElementRenderer(productName: string) {
-    const renderer =
-        (await useBitranRenderers())[productName] ||
-        getDefaultRenderers()[productName];
-
-    if (!renderer)
-        throw new Error(`Missing Bitran product render "${productName}"!`);
-
-    return renderer;
-}
-
-export async function useBitranElementIcon(productName: string) {
-    const renderer = await useBitranElementRenderer(productName);
-    return await getElementIcon(renderer);
-}
-
-export async function useBitranElementLanguage(productName: string) {
-    const renderer = await useBitranElementRenderer(productName);
-    return await createPhraseCaller(renderer, eruditConfig?.language || 'en');
-}
+import eruditConfig from '#erudit/config';
+import bitranConfig from '#erudit/client/bitran';
+
+import {
+    createPhraseCaller,
+    getDefaultRenderers,
+    getElementIcon,
+    type ElementVueRenderers,
+} from '@bitran-js/renderer-vue';
+import {
+    defineBitranTranspiler,
+    type BitranTranspiler,
+    type ElementTranspilers,
+} from '@bitran-js/transpiler';
+import { aliasesName } from '@erudit-js/bitran-elements/aliases/shared';
+import { aliasesTranspiler } from '@erudit-js/bitran-elements/aliases/transpiler';
+import { headingName } from '@erudit-js/bitran-elements/heading/shared';
+import { defineHeadingTranspiler } from '@erudit-js/bitran-elements/heading/transpiler';
+import { includeName } from '@erudit-js/bitran-elements/include/shared';
+import { includeTranspiler } from '@erudit-js/bitran-elements/include/transpiler';
+import { linkName } from '@erudit/shared/bitran/link/shared';
+import { linkTranspiler } from '@erudit/shared/bitran/link/transpiler';
+import { aliasesRenderer } from '@erudit-js/bitran-elements/aliases/renderer';
+import { headingRenderer } from '@erudit-js/bitran-elements/heading/renderer';
+import { includeRenderer } from '@erudit-js/bitran-elements/include/renderer';
+import { linkRenderer } from '@erudit/shared/bitran/link/renderer';
+
+let bitranTranspiler!: BitranTranspiler;
+let bitranRenderers!: ElementVueRenderers;
+
+//
+// Transpiler
+//
+
+export async function useBitranTranspiler() {
+    if (bitranTranspiler) return bitranTranspiler;
+
+    const projectTranspilers = await getProjectTranspilers();
+
+    const defaultTranspilers = {
+        [aliasesName]: aliasesTranspiler,
+        [includeName]: includeTranspiler,
+        [headingName]: defineHeadingTranspiler({
+            language: eruditConfig?.language,
+        }),
+        [linkName]: linkTranspiler,
+    };
+
+    bitranTranspiler = defineBitranTranspiler({
+        ...projectTranspilers,
+        ...defaultTranspilers,
+    });
+
+    return bitranTranspiler;
+}
+
+async function getProjectTranspilers(): Promise<ElementTranspilers> {
+    const bitranElements = bitranConfig.elements;
+
+    if (!bitranElements) return {};
+
+    const projectTranspilers: ElementTranspilers = {};
+    for (const [name, bitranElement] of Object.entries(bitranElements))
+        projectTranspilers[name] = await bitranElement.transpiler();
+
+    return projectTranspilers;
+}
+
+//
+// Renderers
+//
+
+export async function useBitranRenderers() {
+    if (bitranRenderers) return bitranRenderers;
+
+    const projectRenderers = await getProjectRenderers();
+
+    const defaultRenderers = {
+        [aliasesName]: aliasesRenderer,
+        [includeName]: includeRenderer,
+        [headingName]: headingRenderer,
+        [linkName]: linkRenderer,
+    };
+
+    // @ts-ignore
+    bitranRenderers = {
+        ...projectRenderers,
+        ...defaultRenderers,
+    };
+
+    return bitranRenderers!;
+}
+
+async function getProjectRenderers() {
+    const bitranElements = bitranConfig.elements;
+
+    if (!bitranElements) return {};
+
+    const projectRenderers: ElementVueRenderers = {};
+    for (const [name, bitranElement] of Object.entries(bitranElements))
+        projectRenderers[name] = await bitranElement.renderer();
+
+    return projectRenderers;
+}
+
+//
+// Utils
+//
+
+export async function useBitranElementRenderer(productName: string) {
+    const renderer =
+        (await useBitranRenderers())[productName] ||
+        getDefaultRenderers()[productName];
+
+    if (!renderer)
+        throw new Error(`Missing Bitran product render "${productName}"!`);
+
+    return renderer;
+}
+
+export async function useBitranElementIcon(productName: string) {
+    const renderer = await useBitranElementRenderer(productName);
+    return await getElementIcon(renderer);
+}
+
+export async function useBitranElementLanguage(productName: string) {
+    const renderer = await useBitranElementRenderer(productName);
+    return await createPhraseCaller(renderer, eruditConfig?.language || 'en');
+}

package/app/composables/bitranContent.ts

@@ -1,39 +1,39 @@
-import type { ShallowRef } from 'vue';
-import type { BitranContent } from '@bitran-js/renderer-vue';
-
-import {
-    encodeBitranLocation,
-    stringifyBitranLocation,
-    type BitranLocation,
-} from '@erudit/shared/bitran/location';
-
-export async function useBitranContent(
-    location: Ref<BitranLocation | undefined>,
-) {
-    const nuxtApp = useNuxtApp();
-    const content = shallowRef<BitranContent>();
-
-    let contentPromise: Promise<ShallowRef<BitranContent>>;
-
-    watchEffect(() => {
-        if (!location.value) {
-            // @ts-ignore
-            contentPromise = (() => {
-                content.value = undefined;
-                return content;
-            })();
-        }
-
-        const apiRoute = `/api/bitran/content/${encodeBitranLocation(stringifyBitranLocation(location.value!))}`;
-        nuxtApp.runWithContext(() => prerenderRoutes(apiRoute));
-        // @ts-ignore
-        contentPromise = (async () => {
-            content.value = (await $fetch(apiRoute, {
-                responseType: 'json',
-            })) as BitranContent;
-            return content;
-        })();
-    });
-
-    return contentPromise!;
-}
+import type { ShallowRef } from 'vue';
+import type { BitranContent } from '@bitran-js/renderer-vue';
+
+import {
+    encodeBitranLocation,
+    stringifyBitranLocation,
+    type BitranLocation,
+} from '@erudit/shared/bitran/location';
+
+export async function useBitranContent(
+    location: Ref<BitranLocation | undefined>,
+) {
+    const nuxtApp = useNuxtApp();
+    const content = shallowRef<BitranContent>();
+
+    let contentPromise: Promise<ShallowRef<BitranContent>>;
+
+    watchEffect(() => {
+        if (!location.value) {
+            // @ts-ignore
+            contentPromise = (() => {
+                content.value = undefined;
+                return content;
+            })();
+        }
+
+        const apiRoute = `/api/bitran/content/${encodeBitranLocation(stringifyBitranLocation(location.value!))}`;
+        nuxtApp.runWithContext(() => prerenderRoutes(apiRoute));
+        // @ts-ignore
+        contentPromise = (async () => {
+            content.value = (await $fetch(apiRoute, {
+                responseType: 'json',
+            })) as BitranContent;
+            return content;
+        })();
+    });
+
+    return contentPromise!;
+}

package/app/composables/bitranLocation.ts

@@ -1,7 +1,7 @@
-import { locationFromPath, type BitranLocation } from '@shared/bitran/location';
-
-export function useBitranLocation(): ComputedRef<BitranLocation | undefined> {
-    const route = useRoute();
-
-    return computed(() => locationFromPath(route.path));
-}
+import { locationFromPath, type BitranLocation } from '@shared/bitran/location';
+
+export function useBitranLocation(): ComputedRef<BitranLocation | undefined> {
+    const route = useRoute();
+
+    return computed(() => locationFromPath(route.path));
+}

package/app/composables/contentData.ts

@@ -1,36 +1,36 @@
-import type { ContentData } from '@shared/content/data';
-
-export function useContentData<T extends ContentData>() {
-    const nuxtApp = useNuxtApp();
-    const contentRoute = useContentRoute();
-
-    const payloadKey = 'content-data';
-    const payload =
-        (nuxtApp.static.data[payloadKey] ||=
-        nuxtApp.payload.data[payloadKey] ||=
-            {});
-
-    const data = ref<T>();
-    let promise: Promise<typeof data> | undefined;
-
-    watchEffect(() => {
-        // @ts-ignore
-        promise = (async () => {
-            if (!contentRoute.value) {
-                data.value = undefined;
-                return;
-            }
-
-            const contentId = contentRoute.value.contentId;
-
-            const payloadValue = (payload[contentId] ||= await $fetch(
-                '/api/content/data',
-                { query: { contentId } },
-            ));
-            data.value = payloadValue as T;
-            return data;
-        })();
-    });
-
-    return promise as any as Promise<Ref<T>>;
-}
+import type { ContentData } from '@shared/content/data';
+
+export function useContentData<T extends ContentData>() {
+    const nuxtApp = useNuxtApp();
+    const contentRoute = useContentRoute();
+
+    const payloadKey = 'content-data';
+    const payload =
+        (nuxtApp.static.data[payloadKey] ||=
+        nuxtApp.payload.data[payloadKey] ||=
+            {});
+
+    const data = ref<T>();
+    let promise: Promise<typeof data> | undefined;
+
+    watchEffect(() => {
+        // @ts-ignore
+        promise = (async () => {
+            if (!contentRoute.value) {
+                data.value = undefined;
+                return;
+            }
+
+            const contentId = contentRoute.value.contentId;
+
+            const payloadValue = (payload[contentId] ||= await $fetch(
+                '/api/content/data',
+                { query: { contentId } },
+            ));
+            data.value = payloadValue as T;
+            return data;
+        })();
+    });
+
+    return promise as any as Promise<Ref<T>>;
+}