erudit 3.0.0-dev.2 → 3.0.0-dev.20

package/test/contentId.test.ts

@@ -0,0 +1,91 @@
+import {
+    toAbsoluteContentPath,
+    resolveContentPath,
+} from '@erudit/shared/bitran/contentId';
+
+describe('resolveContentPath', () => {
+    it('should handle empty paths', () => {
+        expect(resolveContentPath('')).toBe('');
+    });
+
+    it('should not change paths without special symbols', () => {
+        expect(resolveContentPath('foo/bar/baz')).toBe('foo/bar/baz');
+    });
+
+    it('should skip empty path parts', () => {
+        expect(resolveContentPath('/foo///bar/baz/')).toBe('foo/bar/baz');
+    });
+
+    it('should handle ".." parts', () => {
+        const testCases = [
+            ['foo/bar/../baz', 'foo/baz'],
+            ['../../../foo/bar/baz', 'foo/bar/baz'],
+            ['foo/../../../bar/baz', 'bar/baz'],
+            ['../../..', ''],
+        ];
+
+        for (const [input, expected] of testCases) {
+            expect(resolveContentPath(input!)).toBe(expected);
+        }
+    });
+
+    it('should handle "." parts', () => {
+        const testCases = [
+            ['.', ''],
+            ['./foo/bar/baz', 'foo/bar/baz'],
+            ['./foo/./bar', 'foo/bar'],
+            ['foo/./././bar', 'foo/bar'],
+        ];
+
+        for (const [input, expected] of testCases) {
+            expect(resolveContentPath(input!)).toBe(expected);
+        }
+    });
+
+    it('should handle paths with both "." and ".." parts', () => {
+        const testCases = [
+            ['./../.', ''],
+            ['foo/./../bar', 'foo/bar'],
+        ];
+
+        for (const [input, expected] of testCases) {
+            expect(resolveContentPath(input!)).toBe(expected);
+        }
+    });
+});
+
+describe('toAbsoluteContentPath', () => {
+    const bookIds = ['combinatorics', 'group/book'];
+
+    it('should not use context on absolute paths', () => {
+        expect(
+            toAbsoluteContentPath('/foo/bar/../baz', 'qux/vaz', bookIds),
+        ).toBe('foo/baz');
+    });
+
+    it('should fallback to absolute path if not inside book', () => {
+        expect(
+            toAbsoluteContentPath('~/foo/bar', 'unknown-book', bookIds),
+        ).toBe('foo/bar');
+    });
+
+    it('should correctly handle book-relative paths', () => {
+        expect(toAbsoluteContentPath('~/foo/bar', 'group/book', bookIds)).toBe(
+            'group/book/foo/bar',
+        );
+    });
+
+    it('should by default append context before given content id', () => {
+        const testCases = [
+            ['baz/qux', 'foo/bar', 'foo/bar/baz/qux'],
+            ['./baz/qux', 'foo/bar', 'foo/bar/baz/qux'],
+            ['../baz/qux', 'foo/bar', 'foo/baz/qux'],
+        ];
+
+        for (const [contentId, context, expected] of testCases) {
+            expect(toAbsoluteContentPath(contentId!, context!, bookIds)).toBe(
+                expected,
+            );
+        }
+    });
+});

package/tsconfig.json

@@ -1,8 +1,8 @@
-{
-    "extends": "../../playground/.erudit/nuxt/.nuxt/tsconfig.json",
-    "compilerOptions": {
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true,
-        "types": ["@types/jest"]
-    }
-}
+{
+    "extends": "../../playground/.erudit/nuxt/.nuxt/tsconfig.json",
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "types": ["@types/jest"]
+    }
+}

package/utils/contentPath.ts

@@ -0,0 +1,67 @@
+import { readdirSync, statSync } from 'fs';
+
+// A directory is considered a "content directory" if it contains book, group, or topic with a file having a .js or .ts extension.
+// When a directory qualifies as a content directory, its name is simplified by removing any leading digits and a '+' or '-' (e.g., "29+foo" becomes "foo").
+
+const contentFileRegex = /^(book|group|topic)\.(js|ts)$/i;
+
+function normalizePath(path: string): string {
+    return path.replace(/\\/g, '/');
+}
+
+export function isContentDirectory(directory: string): boolean {
+    if (!statSync(directory).isDirectory()) {
+        return false;
+    }
+
+    return readdirSync(directory).some((file) => {
+        return contentFileRegex.test(file);
+    });
+}
+
+export function getContentPath(path: string, cwd?: string): string {
+    path = normalizePath(path);
+    cwd = cwd ? normalizePath(cwd) : undefined;
+
+    const unresolvedParts = path.split('/').filter(Boolean);
+    const resolvedParts: string[] = [];
+
+    let currentPath = cwd || '';
+    while (unresolvedParts.length) {
+        const currentPart = unresolvedParts.shift()!;
+        currentPath += '/' + currentPart;
+        if (isContentDirectory(currentPath)) {
+            resolvedParts.push(currentPart.replace(/^\d+(?:\+|-)/, ''));
+        } else {
+            resolvedParts.push(currentPart);
+        }
+    }
+
+    return resolvedParts.join('/');
+}
+
+export function scanContentPaths(directory: string): Record<string, string> {
+    directory = normalizePath(directory);
+
+    const map: Record<string, string> = {};
+
+    function traverse(currentPath: string) {
+        const files = readdirSync(currentPath);
+
+        for (const file of files) {
+            const fullPath = currentPath + '/' + file;
+            const relativePath = fullPath.slice(directory.length + 1);
+            const stat = statSync(fullPath);
+
+            if (stat.isDirectory()) {
+                traverse(fullPath);
+            } else {
+                map[getContentPath(relativePath, directory)] = relativePath;
+            }
+        }
+    }
+
+    traverse(directory);
+
+    return map;
+}

package/utils/slash.ts

@@ -0,0 +1,11 @@
+export function trailingSlash(path: string, add: boolean): string {
+    if (path === '/') {
+        return '/';
+    }
+
+    if (add) {
+        return path.endsWith('/') ? path : `${path}/`;
+    }
+
+    return path.endsWith('/') ? path.slice(0, -1) : path;
+}

package/utils/stress.ts

@@ -1,9 +1,9 @@
-import chalk, { type ChalkInstance } from 'chalk';
-
-export function stress(message: string, contentChalk?: ChalkInstance) {
-    return (
-        chalk.dim(`'`) +
-        (contentChalk ? contentChalk(message) : chalk.cyanBright(message)) +
-        chalk.dim(`'`)
-    );
-}
+import chalk, { type ChalkInstance } from 'chalk';
+
+export function stress(message: string, contentChalk?: ChalkInstance) {
+    return (
+        chalk.dim(`'`) +
+        (contentChalk ? contentChalk(message) : chalk.cyanBright(message)) +
+        chalk.dim(`'`)
+    );
+}

package/app/components/ads/BannerTemplate.vue

@@ -1,51 +0,0 @@
-<script lang="ts" setup>
-const props = defineProps<{
-    bannerId: string;
-}>();
-
-const { getElementId, registerBanner } = useDarkMagic();
-const phrase = await usePhrases('ads_replacer', '_language_code');
-
-onMounted(() => {
-    registerBanner(props.bannerId);
-});
-</script>
-
-<template>
-    <section :class="$style.darkMagicContainer">
-        <div :id="getElementId(bannerId)">
-            <div :class="$style.darkMagicReplacer">
-                <MyIcon name="pirate" />
-                <div v-html="phrase.ads_replacer"></div>
-            </div>
-        </div>
-    </section>
-</template>
-
-<style lang="scss" module>
-.darkMagicContainer {
-    --maxHeight: 300px;
-
-    > div {
-        width: 100%;
-        max-height: var(--maxHeight);
-    }
-}
-
-.darkMagicReplacer {
-    max-height: var(--maxHeight);
-    height: var(--maxHeight);
-    width: 100%;
-    background: var(--bgAccent);
-    box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.1) inset;
-    color: var(--textMuted);
-
-    @include dark {
-        box-shadow: 0px 0px 3px 1px rgba(white, 0.025) inset;
-    }
-
-    strong {
-        color: inherit;
-    }
-}
-</style>

package/app/components/ads/BottomBanner.vue

@@ -1,45 +0,0 @@
-<script lang="ts" setup>
-import eruditConfig from '#erudit/config';
-</script>
-
-<template>
-    <AdsBannerTemplate
-        :bannerId="eruditConfig.ads!.bottomBlockId!"
-        :class="$style.darkMagicBottom"
-    />
-</template>
-
-<style lang="scss" module>
-@use '$/def/bp';
-@use '$/partials/darkMagic';
-
-.darkMagicBottom {
-    --maxHeight: 300px;
-
-    padding: var(--_pMainY) var(--_pMainX);
-    padding-top: var(--gapBig);
-
-    @include darkMagic.replacer {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        gap: var(--gapBig);
-        font-size: 22px;
-
-        [my-icon] {
-            font-size: 60px;
-        }
-
-        @include bp.below('mobile') {
-            flex-direction: column;
-            gap: var(--gap);
-            font-size: 16px;
-            text-align: center;
-
-            [my-icon] {
-                font-size: 68px;
-            }
-        }
-    }
-}
-</style>

package/app/components/ads/LeftBanner.vue

@@ -1,50 +0,0 @@
-<script lang="ts" setup>
-import eruditConfig from '#erudit/config';
-</script>
-
-<template>
-    <AdsBannerTemplate
-        :bannerId="eruditConfig.ads!.leftBlockId!"
-        :class="$style.darkMagicLeft"
-    />
-</template>
-
-<style lang="scss" module>
-@use '$/partials/darkMagic';
-
-.darkMagicLeft {
-    --maxHeight: 300px;
-
-    padding: var(--gap);
-    border-top: 1px solid var(--border);
-
-    @media (max-height: 1080px) {
-        --maxHeight: 200px;
-    }
-
-    @media (max-height: 700px) {
-        --maxHeight: 100px;
-        [my-icon] {
-            display: none;
-        }
-    }
-
-    @media (max-height: 350px) {
-        display: none;
-    }
-
-    @include darkMagic.replacer {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        gap: var(--gap);
-        text-align: center;
-        font-size: 0.95em;
-
-        [my-icon] {
-            font-size: 46px;
-        }
-    }
-}
-</style>

package/app/components/aside/minor/AsideMinorContributor.vue

@@ -1,5 +0,0 @@
-<template>
-    <AsideMinorPane>
-        <div>Contributor</div>
-    </AsideMinorPane>
-</template>

package/app/components/main/utils/ContentDescription.vue

@@ -1,19 +0,0 @@
-<script lang="ts" setup>
-defineProps<{ description: string }>();
-const pretty = await useFormatText();
-</script>
-
-<template>
-    <section :class="$style.contentDescription">
-        {{ pretty(description) }}
-    </section>
-</template>
-
-<style lang="scss" module>
-.contentDescription {
-    padding: var(--_pMainY) var(--_pMainX);
-    font-weight: 500;
-    font-size: 1.1em;
-    color: var(--text);
-}
-</style>

package/app/components/main/utils/ContentFlag.vue

@@ -1,15 +0,0 @@
-<script lang="ts" setup>
-import { computePosition, shift, autoUpdate, arrow } from '@floating-ui/dom';
-
-defineProps<{ icon: string; title: string }>();
-</script>
-
-<template>
-    <div :class="$style.flag">Content flag</div>
-</template>
-
-<style lang="scss" module>
-.flag {
-    color: red;
-}
-</style>

package/app/components/main/utils/ContentTitle.vue

@@ -1,39 +0,0 @@
-<script lang="ts" setup>
-import { isMyIcon } from '#my-icons';
-
-defineProps<{ icon: string; title: string; hint?: string }>();
-</script>
-
-<template>
-    <section :class="$style.contentTitle">
-        <MyIcon v-if="isMyIcon(icon)" :name="icon as any" :title="hint" />
-        <MyRuntimeIcon
-            v-else
-            name="content-title-icon"
-            :svg="icon"
-            :title="hint"
-        />
-        <h1>{{ title }}</h1>
-    </section>
-</template>
-
-<style lang="scss" module>
-.contentTitle {
-    display: flex;
-    align-items: center;
-    gap: var(--gap);
-    padding: 0 var(--_pMainX);
-
-    [my-icon] {
-        font-size: 1.65em;
-        color: var(--textMuted);
-        position: relative;
-        top: 1px;
-        cursor: help;
-    }
-
-    h1 {
-        font-size: 1.925em;
-    }
-}
-</style>

package/app/composables/bitranContent.ts

@@ -1,37 +0,0 @@
-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)) as BitranContent;
-            return content;
-        })();
-    });
-
-    return contentPromise!;
-}

package/app/pages/members.vue

@@ -1,6 +0,0 @@
-<script lang="ts" setup></script>
-
-<template>
-    <p>Members</p>
-    <NuxtLink to="/practice/topic-b">Погнали епты!</NuxtLink>
-</template>

package/app/styles/default.scss

@@ -1,83 +0,0 @@
-@use '$/def/size';
-
-//
-// Vars
-//
-
-:root {
-    --transitionSpeed: 200ms;
-    --transitionFunction: cubic-bezier(0, 0, 0.5, 1);
-    interpolate-size: allow-keywords;
-}
-
-// Sizes
-
-:root {
-    --wAside: #{size.$wAside};
-    --wMainMin: #{size.$wMainMin};
-    --wMainMax: #{size.$wMainMax};
-
-    --gap: #{size.$gap};
-    --gapSmall: #{size.$gapSmall};
-    --gapBig: #{size.$gapBig};
-}
-
-// Colors
-
-:root {
-    --bg: light-dark(#ebebeb, #141414);
-    --bgAside: light-dark(#f7f7f7, #1b1b1b);
-    --bgMain: light-dark(#ffffff, #212121);
-    --bgAccent: light-dark(#e6e6e6, #262626);
-
-    --border: light-dark(#d7d7d7, #373737);
-
-    --text: light-dark(#373737, #b9b9b9);
-    --textDeep: light-dark(#232323, #e1e1e1);
-    --textMuted: light-dark(#696969, #7f7f7f);
-    --textDimmed: light-dark(#969696, #616161);
-    --textDisabled: light-dark(#b9b9b9, #4f4f4f);
-
-    --brand: light-dark(#1879d9, #4e94d9);
-    --error: light-dark(#d91818, #d94e4e);
-    --warn: light-dark(#d98718, #d9b44e);
-    --success: light-dark(#12a512, #51a551);
-
-    --scrollbar: light-dark(#bfbfbf, #494949);
-
-    --invert: light-dark(black, white);
-}
-
-//
-// General rules
-//
-
-// Noto Sans + Noto Serif
-@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Noto+Serif:ital,wght@0,100..900;1,100..900&display=swap');
-
-body {
-    background: var(--bg);
-    font-family: 'Noto Sans', system-ui, sans-serif;
-    color: var(--text);
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-strong {
-    color: var(--textDeep);
-}
-
-::selection {
-    //color: var(--text);
-    background: color-mix(in srgb, var(--brand), transparent 65%);
-}
-
-.icon-flip-h {
-    [my-icon] svg {
-        transform: scaleX(-1);
-    }
-}

package/server/api/aside/minor/path.ts

@@ -1,78 +0,0 @@
-import { isTopicPart } from 'erudit-cog/schema';
-
-import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
-import { getBitranToc } from '@erudit/server/plugin/bitran/toc';
-import {
-    getContentContributors,
-    getFullContentId,
-    getPreviousNext,
-} from '@erudit/server/plugin/repository/content';
-import { getTopicPartsLinks } from '@erudit/server/plugin/repository/topic';
-import { locationFromPath } from '@erudit/shared/bitran/location';
-
-export default defineEventHandler(async (event) => {
-    const query = getQuery<{ path: string }>(event);
-
-    if (!query.path)
-        throw createError({
-            statusCode: 400,
-            statusText: 'Missing "path" query parameter!',
-        });
-
-    const path = query.path.substring(1);
-    const pathStart = path.split('/')[0];
-
-    if (isTopicPart(pathStart)) return await createTopicData(path);
-
-    if (['book', 'group'].includes(pathStart))
-        return await createContentData(pathStart, path);
-
-    return 'news';
-});
-
-async function createTopicData(path: string): Promise<AsideMinorTopic> {
-    const location = locationFromPath(path);
-
-    if (!location)
-        throw createError({
-            statusCode: 400,
-            statusText: `Provided path "${path}" is not a valid topic location!`,
-        });
-
-    const contentId = location.path;
-    const fullContentId = (await getFullContentId(contentId))!;
-
-    const toc = await getBitranToc(location);
-    const previousNext = await getPreviousNext(contentId);
-    const topicPartsLinks = await getTopicPartsLinks(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: 'topic',
-        fullContentId,
-        location,
-        toc,
-        nav: {
-            ...previousNext,
-            ...topicPartsLinks,
-        },
-        contributors,
-    };
-}
-
-async function createContentData(
-    type: string,
-    path: string,
-): Promise<AsideMinorContent> {
-    const contentId = path.split('/').slice(1).join('/');
-    const fullContentId = (await getFullContentId(contentId))!;
-    const previousNext = await getPreviousNext(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: type as any,
-        fullContentId,
-        nav: previousNext,
-        contributors,
-    };
-}

package/server/api/bitran/content/[location].ts

@@ -1,7 +0,0 @@
-import { parseUrlLocation } from '@server/bitran/location';
-import { getBitranContent } from '@server/bitran/content';
-
-export default defineEventHandler(async (event) => {
-    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
-    return await getBitranContent(location);
-});

package/server/api/bitran/toc/[location].ts

@@ -1,7 +0,0 @@
-import { parseUrlLocation } from '@server/bitran/location';
-import { getBitranToc } from '@server/bitran/toc';
-
-export default defineEventHandler(async (event) => {
-    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
-    return await getBitranToc(location);
-});