erudit 3.0.0-dev.5 → 3.0.0-dev.7

package/server/plugin/db/entities/Content.ts

@@ -4,7 +4,7 @@ import type {
     ContentReferences,
     ContentSeo,
     ContentType,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { ImageData } from '@erudit/shared/image';
 

package/server/plugin/db/entities/Group.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
-import type { GroupType } from 'erudit-cog/schema';
+import type { GroupType } from '@erudit-js/cog/schema';
 
 @Entity('group')
 export class DbGroup {

package/server/plugin/db/entities/Topic.ts

@@ -1,5 +1,5 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 @Entity('topic')
 export class DbTopic {

package/server/plugin/global.ts

@@ -1,5 +1,5 @@
 import type { DataSource } from 'typeorm';
-import type { EruditBitranConfig, EruditConfig } from 'erudit-cog/schema';
+import type { EruditBitranConfig, EruditConfig } from '@erudit-js/cog/schema';
 
 import type { EruditPhrases } from '@shared/types/language';
 import type { NavNode, RootNavNode } from '@server/nav/node';

package/server/plugin/logger.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { createConsola } from 'consola';
-import { brandColorTitle } from 'erudit-cog/utils/brandNode';
+import { brandColorTitle } from '@erudit-js/cog/utils/brandNode';
 
 import eruditConfig from '#erudit/config';
 

package/server/plugin/nav/node.ts

@@ -1,4 +1,4 @@
-import type { ContentType } from 'erudit-cog/schema';
+import type { ContentType } from '@erudit-js/cog/schema';
 
 export interface NavNode {
     type: ContentType;

package/server/plugin/repository/content.ts

@@ -1,4 +1,4 @@
-import type { ContentType } from 'erudit-cog/schema';
+import type { ContentType } from '@erudit-js/cog/schema';
 import { Like } from 'typeorm';
 
 import { ERUDIT_SERVER } from '@server/global';

package/server/plugin/repository/topic.ts

@@ -1,4 +1,4 @@
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 import { ERUDIT_SERVER } from '@server/global';
 import { DbTopic } from '@server/db/entities/Topic';

package/shared/aside/minor.ts

@@ -1,4 +1,5 @@
-import type { BitranLocation } from '../bitran/location';
+import type { BitranLocation } from '@erudit-js/cog/schema';
+
 import type { Toc } from '../bitran/toc';
 import type { PreviousNextItem } from '../content/previousNext';
 import type { ContentContributor } from '../contributor';

package/shared/bitran/stringContent.ts

@@ -0,0 +1,6 @@
+import type { PreRenderData } from '@bitran-js/transpiler';
+
+export interface StringBitranContent {
+    biCode: string;
+    preRenderData?: Record<string, PreRenderData>;
+}

package/shared/content/data/base.ts

@@ -4,7 +4,7 @@ import type {
     ContentSeo,
     ContentType,
     TopicPart,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { Context } from '@shared/content/context';
 import type { PreviousNext } from '@shared/content/previousNext';

package/shared/content/data/type/topic.ts

@@ -1,4 +1,4 @@
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 import type { ContentBaseData } from '../base';
 

package/shared/frontNav.ts

@@ -1,4 +1,4 @@
-import type { ContentFlag, TopicPart } from 'erudit-cog/schema';
+import type { ContentFlag, TopicPart } from '@erudit-js/cog/schema';
 
 export type FrontNavType = 'book' | 'topic' | 'separator' | 'folder';
 

package/shared/icons.ts

@@ -1,12 +1,12 @@
 import {
     isContentType,
     isTopicPart,
+    type BitranLocation,
     type ContentType,
     type TopicPart,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { MyIconName } from '#my-icons';
-import type { BitranLocation } from './bitran/location';
 
 export const TOPIC_PART_ICON = {
     article: 'outline/file-lines',

package/shared/link.ts

@@ -1,5 +1,8 @@
-import type { ContentType, TopicPart } from 'erudit-cog/schema';
-import type { BitranLocation } from './bitran/location';
+import type {
+    BitranLocation,
+    ContentType,
+    TopicPart,
+} from '@erudit-js/cog/schema';
 
 export function createBitranLocationLink(location: BitranLocation) {
     let link = `/${location.type}/${location.path}`;

package/tsconfig.json

@@ -3,6 +3,6 @@
     "compilerOptions": {
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
-        "types": ["@types/jest"]
+        "types": ["@types/jest", "@erudit-js/cog/types"]
     }
 }

package/shared/bitran/context.ts

@@ -1,8 +0,0 @@
-import { type Aliases } from '@erudit-js/bitran-elements/aliases/shared';
-
-import type { BitranLocation } from './location';
-
-export interface BitranContext {
-    location: BitranLocation;
-    aliases: Aliases;
-}

package/shared/bitran/default.ts

@@ -1,46 +0,0 @@
-import {
-    defineBitranElement,
-    type BitranElements,
-} from '@erudit/globals/bitran';
-
-// Erudit Default Elements
-import {
-    aliasesName,
-    type AliasesSchema,
-} from '@erudit-js/bitran-elements/aliases/shared';
-import { aliasesTranspiler } from '@erudit-js/bitran-elements/aliases/transpiler';
-import { aliasesRenderer } from '@erudit-js/bitran-elements/aliases/renderer';
-import {
-    includeName,
-    type IncludeSchema,
-} from '@erudit-js/bitran-elements/include/shared';
-import { includeTranspiler } from '@erudit-js/bitran-elements/include/transpiler';
-import { includeRenderer } from '@erudit-js/bitran-elements/include/renderer';
-import {
-    headingName,
-    type HeadingSchema,
-} from '@erudit-js/bitran-elements/heading/shared';
-import { headingTranspiler } from '@erudit-js/bitran-elements/heading/transpiler';
-import { headingRenderer } from '@erudit-js/bitran-elements/heading/renderer';
-import { linkName, type LinkSchema } from '@erudit/shared/bitran/link/shared';
-import { linkTranspiler } from '@erudit/shared/bitran/link/transpiler';
-import { linkRenderer } from '@erudit/shared/bitran/link/renderer';
-
-export const defaultElements: BitranElements = {
-    [aliasesName]: defineBitranElement<AliasesSchema>({
-        transpiler: async () => aliasesTranspiler,
-        renderer: async () => aliasesRenderer,
-    }),
-    [includeName]: defineBitranElement<IncludeSchema>({
-        transpiler: async () => includeTranspiler,
-        renderer: async () => includeRenderer,
-    }),
-    [headingName]: defineBitranElement<HeadingSchema>({
-        transpiler: async () => headingTranspiler,
-        renderer: async () => headingRenderer,
-    }),
-    [linkName]: defineBitranElement<LinkSchema>({
-        transpiler: async () => linkTranspiler,
-        renderer: async () => linkRenderer,
-    }),
-};

package/shared/bitran/link/Link.vue

@@ -1,166 +0,0 @@
-<script lang="ts" setup>
-import type { ElementProps } from '@bitran-js/renderer-vue';
-import { isContentType, isTopicPart } from 'erudit-cog/schema';
-
-import { CONTENT_TYPE_ICON, ICON, TOPIC_PART_ICON } from '@erudit/shared/icons';
-import type { LinkSchema } from './shared';
-import { MyIcon, MyRuntimeIcon } from '#components';
-import { showPreview, togglePreview } from '@erudit/app/scripts/preview/state';
-import { PreviewRequestType } from '@erudit/app/scripts/preview/request';
-import { encodeBitranLocation } from '@erudit/shared/bitran/location';
-
-const { node } = defineProps<ElementProps<LinkSchema>>();
-const { label } = node.parseData;
-const linkTarget = node.renderData;
-
-const baseUrlPath = useBaseUrlPath();
-const formatText = useFormatText();
-
-const Icon = await (async () => {
-    const type = linkTarget.type;
-
-    if (type === 'unique') {
-        return h(MyRuntimeIcon, {
-            name: 'link-icon',
-            svg: await useBitranElementIcon(linkTarget._productName!),
-        });
-    } else if (type === 'absolute') {
-        return h(MyIcon, { name: 'link' });
-    } else if (type === 'external') {
-        return h(MyIcon, { name: 'link-external' });
-    } else if (type === 'page') {
-        const pageType = linkTarget.pageType;
-
-        if (isTopicPart(pageType))
-            return h(MyIcon, { name: TOPIC_PART_ICON[pageType] });
-        if (isContentType(pageType))
-            return h(MyIcon, { name: CONTENT_TYPE_ICON[pageType] });
-
-        switch (pageType) {
-            case 'contributor':
-                return h(MyIcon, { name: ICON.contributor });
-        }
-
-        return h(MyIcon, { name: 'link' });
-    }
-})();
-
-const href = (() => {
-    switch (linkTarget.type) {
-        case 'absolute':
-        case 'external':
-            return linkTarget.href;
-        case 'page':
-        case 'unique':
-            return linkTarget._href!;
-    }
-})();
-
-// Prerendering data for previews to work after site build
-switch (linkTarget.type) {
-    case 'page':
-        prerenderRoutes(`/api/preview/page${linkTarget._href}`);
-        break;
-    case 'unique':
-        prerenderRoutes(
-            `/api/preview/unique/${encodeBitranLocation(linkTarget._absoluteStrLocation!)}`,
-        );
-        break;
-}
-
-const doubleClick = {
-    timeout: null as any,
-    startTimeout() {
-        this.timeout = setTimeout(() => {
-            this.reset();
-        }, 400);
-    },
-    reset() {
-        clearTimeout(this.timeout);
-        this.timeout = null;
-    },
-};
-
-function linkClick(e: Event) {
-    // Direct link traversal is disabled, use double click instead!
-
-    e.stopPropagation();
-    e.preventDefault();
-
-    if (doubleClick.timeout) {
-        doubleClick.reset();
-        togglePreview(false);
-        window.open(baseUrlPath(href), '_blank');
-        return false;
-    }
-
-    showPreview({
-        type: PreviewRequestType.Link,
-        linkData: node.parseData,
-        linkTarget,
-    });
-
-    doubleClick.startTimeout();
-
-    return false;
-}
-</script>
-
-<template>
-    <a
-        :href="baseUrlPath(href)"
-        :class="$style.link"
-        @click="linkClick"
-        :external="true"
-    >
-        <Icon :class="$style.icon" wrapper="span" />
-        <span :class="$style.label">{{ formatText(label) }}</span>
-    </a>
-</template>
-
-<style lang="scss" module>
-.link {
-    --linkColor: var(--brand); //light-dark(#3e66a1, #77a0db);
-
-    display: inline-flex;
-    align-items: center;
-    gap: 3px;
-
-    position: relative;
-    top: 1px;
-
-    padding: 0 3px;
-
-    color: var(--linkColor);
-    text-decoration-thickness: 2px;
-    text-decoration-style: solid;
-    text-decoration-color: color-mix(
-        in srgb,
-        var(--linkColor),
-        transparent 75%
-    );
-
-    border-radius: 5px;
-
-    @include transition(background);
-
-    &:hover,
-    &:active {
-        background: color-mix(in srgb, var(--linkColor), transparent 87.5%);
-    }
-
-    .icon {
-        flex-shrink: 0;
-        position: relative;
-        top: 1px;
-        font-size: 0.86em;
-
-        text-decoration: none;
-        color: color-mix(in srgb, var(--linkColor), transparent 10%);
-    }
-
-    .label {
-        font-weight: 450;
-    }
-}
-</style>

package/shared/bitran/link/factory.ts

@@ -1,24 +0,0 @@
-import {
-    RegexpInlinerParseFactory,
-    StringifyFactory,
-} from '@bitran-js/transpiler';
-
-import type { LinkSchema } from './shared';
-
-export class LinkParser extends RegexpInlinerParseFactory<LinkSchema> {
-    regexp = /\[(.+?)\]\((.+?)\)/gm;
-
-    override async parseDataFromRegexp(match: RegExpExecArray) {
-        return {
-            label: match[1]!,
-            target: match[2]!,
-        };
-    }
-}
-
-export class LinkStringifier extends StringifyFactory<LinkSchema> {
-    override async stringifyElement(): Promise<string> {
-        const { parseData } = this.payload();
-        return `[${parseData.label}](${parseData.target})`;
-    }
-}

package/shared/bitran/link/icon.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
-    <path d="M579.8 267.7c56.5-56.5 56.5-148 0-204.5c-50-50-128.8-56.5-186.3-15.4l-1.6 1.1c-14.4 10.3-17.7 30.3-7.4 44.6s30.3 17.7 44.6 7.4l1.6-1.1c32.1-22.9 76-19.3 103.8 8.6c31.5 31.5 31.5 82.5 0 114L422.3 334.8c-31.5 31.5-82.5 31.5-114 0c-27.9-27.9-31.5-71.8-8.6-103.8l1.1-1.6c10.3-14.4 6.9-34.4-7.4-44.6s-34.4-6.9-44.6 7.4l-1.1 1.6C206.5 251.2 213 330 263 380c56.5 56.5 148 56.5 204.5 0L579.8 267.7zM60.2 244.3c-56.5 56.5-56.5 148 0 204.5c50 50 128.8 56.5 186.3 15.4l1.6-1.1c14.4-10.3 17.7-30.3 7.4-44.6s-30.3-17.7-44.6-7.4l-1.6 1.1c-32.1 22.9-76 19.3-103.8-8.6C74 372 74 321 105.5 289.5L217.7 177.2c31.5-31.5 82.5-31.5 114 0c27.9 27.9 31.5 71.8 8.6 103.9l-1.1 1.6c-10.3 14.4-6.9 34.4 7.4 44.6s34.4 6.9 44.6-7.4l1.1-1.6C433.5 260.8 427 182 377 132c-56.5-56.5-148-56.5-204.5 0L60.2 244.3z" />
-</svg>

package/shared/bitran/link/languages/en.ts

@@ -1,7 +0,0 @@
-import { defineLanguage } from '@bitran-js/renderer-vue';
-
-const english = defineLanguage({
-    _element_title: 'Link',
-});
-
-export default english;

package/shared/bitran/link/languages/ru.ts

@@ -1,7 +0,0 @@
-import { defineLanguage } from '@bitran-js/renderer-vue';
-
-const russian = defineLanguage({
-    _element_title: 'Ссылка',
-});
-
-export default russian;

package/shared/bitran/link/renderer.ts

@@ -1,21 +0,0 @@
-import {
-    defineElementVueRenderer,
-    defineComponent,
-    defineIcon,
-    defineLanguages,
-} from '@bitran-js/renderer-vue';
-
-import { LinkNode, type LinkSchema } from './shared';
-
-export const linkRenderer = defineElementVueRenderer<LinkSchema>({
-    Node: LinkNode,
-    component: defineComponent(() => import('./Link.vue')),
-    icon: defineIcon(() => import('./icon.svg?raw')),
-    languages: defineLanguages({
-        en: () => import('./languages/en'),
-        ru: () => import('./languages/ru'),
-    }),
-    createRenderData: async () => {
-        throw Error('Render data for Links must be built only on server side!');
-    },
-});

package/shared/bitran/link/shared.ts

@@ -1,17 +0,0 @@
-import { InlinerNode, type DefineElementSchema } from '@bitran-js/core';
-
-import type { LinkTarget } from './target';
-
-export const linkName = 'link';
-
-export interface LinkParseData {
-    target: string;
-    label: string;
-}
-
-export type LinkSchema = DefineElementSchema<{
-    ParseData: LinkParseData;
-    RenderData: LinkTarget;
-}>;
-
-export class LinkNode extends InlinerNode<LinkSchema> {}

package/shared/bitran/link/target.ts

@@ -1,134 +0,0 @@
-import { isTopicPart } from 'erudit-cog/schema';
-import { tryReplaceAlias } from '@erudit-js/bitran-elements/aliases/shared';
-
-import type { BitranContext } from '@shared/bitran/context';
-import {
-    bitranLocationTypes,
-    parsePartialBitranLocation,
-    stringifyBitranLocation,
-} from '@shared/bitran/location';
-
-export type LinkTargetType = 'unique' | 'page' | 'absolute' | 'external';
-
-interface LinkTargetBase {
-    type: LinkTargetType;
-}
-
-export interface UniqueLinkTarget extends LinkTargetBase {
-    type: 'unique';
-    strlocation: string;
-    _productName?: string;
-    _absoluteStrLocation?: string;
-    _href?: string;
-}
-
-export const linkTargetPageTypes = {
-    ...bitranLocationTypes,
-    // Custom page types, that does not have Bitran content
-    book: true,
-};
-
-export type LinkTargetPageType = keyof typeof linkTargetPageTypes;
-
-export function isLinkTargetPageType(
-    pageType: any,
-): pageType is LinkTargetPageType {
-    return pageType in linkTargetPageTypes;
-}
-
-function pageTypeRequiresPath(type: LinkTargetPageType) {
-    return linkTargetPageTypes[type];
-}
-
-export interface PageLinkTarget extends LinkTargetBase {
-    type: 'page';
-    pageType: LinkTargetPageType;
-    path?: string;
-    _href?: string;
-}
-
-export interface AbsoluteLinkTarget extends LinkTargetBase {
-    type: 'absolute';
-    href: string;
-}
-
-export interface ExternalLinkTarget extends LinkTargetBase {
-    type: 'external';
-    href: string;
-}
-
-export type LinkTarget =
-    | UniqueLinkTarget
-    | PageLinkTarget
-    | AbsoluteLinkTarget
-    | ExternalLinkTarget;
-
-export function createLinkTarget(
-    target: string,
-    context: BitranContext,
-): LinkTarget {
-    target = tryReplaceAlias(target, context.aliases);
-
-    if (target.startsWith('/'))
-        return {
-            type: 'absolute',
-            href: target,
-        };
-
-    try {
-        new URL(target);
-        return {
-            type: 'external',
-            href: target,
-        };
-    } catch {}
-
-    if (target.startsWith('page|')) {
-        let [, pageType, path] = target.split('|');
-
-        if (!isLinkTargetPageType(pageType))
-            throw new Error(
-                `Unknown page type "${pageType}" in link "${target}"!`,
-            );
-
-        if (!path) {
-            if (isTopicPart(pageType)) {
-                if (!isTopicPart(context.location.type))
-                    throw new Error(
-                        `Page link "${target}" is referencing topic part "${pageType}" without path in non-topic context!`,
-                    );
-
-                path = context.location.path;
-            } else {
-                if (pageTypeRequiresPath(pageType))
-                    throw new Error(
-                        `Page link "${target}" does not have a path!`,
-                    );
-            }
-        }
-
-        return {
-            type: 'page',
-            pageType,
-            path,
-        };
-    }
-
-    const location = parsePartialBitranLocation(target, context.location);
-
-    if (
-        !location.unique &&
-        isLinkTargetPageType(location.type) &&
-        !isTopicPart(location.type)
-    )
-        return {
-            type: 'page',
-            pageType: location.type,
-            path: location.path,
-        };
-
-    return {
-        type: 'unique',
-        strlocation: stringifyBitranLocation(location),
-    };
-}

package/shared/bitran/link/transpiler.ts

@@ -1,10 +0,0 @@
-import { defineElementTranspiler } from '@bitran-js/transpiler';
-
-import { LinkNode, type LinkSchema } from './shared';
-import { LinkParser, LinkStringifier } from './factory';
-
-export const linkTranspiler = defineElementTranspiler<LinkSchema>({
-    Node: LinkNode,
-    Parsers: [LinkParser],
-    Stringifier: LinkStringifier,
-});