erudit 3.0.0-dev.15 → 3.0.0-dev.17

package/test/contentId.test.ts

@@ -1,91 +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,
-            );
-        }
-    });
-});
+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

@@ -1,67 +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;
-}
+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

@@ -1,11 +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;
-}
+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/module/problemGenerators.ts

@@ -1,46 +0,0 @@
-import { addTemplate } from 'nuxt/kit';
-import type { Nuxt } from 'nuxt/schema';
-import { globSync } from 'glob';
-
-import { eruditEndNuxtPath, projectPath } from '@erudit/globalPath';
-import { getContentPath } from '@erudit/utils/contentPath';
-
-export async function setupProblemGenerators(_nuxt: Nuxt) {
-    const templateName = '#erudit/problemGenerators.ts';
-
-    addTemplate({
-        filename: templateName,
-        write: true,
-        async getContents() {
-            const generatorFiles = findGenerators();
-
-            return `
-export const loaders = {
-${generatorFiles
-    .map((file) => {
-        const filePath = projectPath('content/' + file);
-        const contentPath = getContentPath(
-            file,
-            projectPath('content'),
-        ).replace(/\.gen\.(js|ts)$/, '');
-        return `    '${contentPath}': async () => (await import('${filePath}')).default,`;
-    })
-    .join('\n')}
-}
-            `.trim();
-        },
-    });
-
-    const alias = (_nuxt.options.alias ||= {});
-    alias['#erudit/problemGenerators'] = eruditEndNuxtPath(
-        `.nuxt/${templateName}`,
-    );
-}
-
-function findGenerators() {
-    const generatorFiles = globSync('**/*.gen.{js,ts}', {
-        cwd: projectPath('content'),
-        posix: true,
-    });
-    return generatorFiles;
-}