erudit 2.0.0-dev.7 → 2.0.0-dev.9

package/app/scripts/preview/request.ts

@@ -1,5 +1,5 @@
-import type { LinkData } from '@erudit/shared/bitran/products/link/shared';
-import type { LinkTarget } from '@erudit/shared/bitran/products/link/target';
+import type { LinkData } from '@erudit/shared/bitran/link/shared';
+import type { LinkTarget } from '@erudit/shared/bitran/link/target';
 
 import type { PreviewData } from './data';
 

package/app/styles/_immediate.css

@@ -1,3 +1,3 @@
-/* Instant color theme setup */
-:root { color-scheme: light; }
+/* Instant color theme setup */
+:root { color-scheme: light; }
 :root[data-theme='dark'] { color-scheme: dark; }

package/app/styles/_util.scss

@@ -1,50 +1,50 @@
-@mixin transition($properties...)
-{
-    transition: all var(--transitionSpeed) var(--transitionFunction);
-    transition-property: $properties;
-}
-
-@mixin dark
-{
-    :root[data-theme='dark'] &
-    {
-        @content;
-    }
-}
-
-@mixin hoverLink
-{
-    cursor: pointer;
-    color: inherit;
-    text-decoration: underline;
-    text-decoration-color: transparent;
-    @include transition(text-decoration-color);
-
-    &:hover
-    {
-        text-decoration: underline;
-    }
-}
-
-@mixin scroll
-{
-    -webkit-overflow-scrolling: auto;
-
-    &::-webkit-scrollbar
-    {
-        -webkit-appearance: none;
-        height: 5px;
-        width: 5px;
-    }
-
-    &::-webkit-scrollbar-thumb
-    {
-        background: var(--scrollbar);
-        &:hover { background: color-mix(in srgb, var(--scrollbar), var(--invert) 15%); }
-    }
-
-    &::-webkit-scrollbar-corner
-    {
-        background: var(--border);
-    }
+@mixin transition($properties...)
+{
+    transition: all var(--transitionSpeed) var(--transitionFunction);
+    transition-property: $properties;
+}
+
+@mixin dark
+{
+    :root[data-theme='dark'] &
+    {
+        @content;
+    }
+}
+
+@mixin hoverLink
+{
+    cursor: pointer;
+    color: inherit;
+    text-decoration: underline;
+    text-decoration-color: transparent;
+    @include transition(text-decoration-color);
+
+    &:hover
+    {
+        text-decoration: underline;
+    }
+}
+
+@mixin scroll
+{
+    -webkit-overflow-scrolling: auto;
+
+    &::-webkit-scrollbar
+    {
+        -webkit-appearance: none;
+        height: 5px;
+        width: 5px;
+    }
+
+    &::-webkit-scrollbar-thumb
+    {
+        background: var(--scrollbar);
+        &:hover { background: color-mix(in srgb, var(--scrollbar), var(--invert) 15%); }
+    }
+
+    &::-webkit-scrollbar-corner
+    {
+        background: var(--border);
+    }
 }

package/app/styles/_utils.scss

@@ -1,44 +1,44 @@
-@mixin transition($properties...) {
-    transition: all var(--transitionSpeed) var(--transitionFunction);
-    transition-property: $properties;
-}
-
-@mixin dark {
-    :root[data-theme='dark'] & {
-        @content;
-    }
-}
-
-@mixin hoverLink {
-    cursor: pointer;
-    color: inherit;
-    text-decoration: underline;
-    text-decoration-color: transparent;
-    @include transition(text-decoration-color);
-
-    &:hover {
-        text-decoration: underline;
-    }
-}
-
-@mixin scroll {
-    -webkit-overflow-scrolling: auto;
-
-    &::-webkit-scrollbar {
-        -webkit-appearance: none;
-        height: 5px;
-        width: 5px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-        background: var(--scrollbar);
-
-        &:hover {
-            background: color-mix(in srgb, var(--scrollbar), var(--invert) 15%);
-        }
-    }
-
-    &::-webkit-scrollbar-corner {
-        background: var(--border);
-    }
-}
+@mixin transition($properties...) {
+    transition: all var(--transitionSpeed) var(--transitionFunction);
+    transition-property: $properties;
+}
+
+@mixin dark {
+    :root[data-theme='dark'] & {
+        @content;
+    }
+}
+
+@mixin hoverLink {
+    cursor: pointer;
+    color: inherit;
+    text-decoration: underline;
+    text-decoration-color: transparent;
+    @include transition(text-decoration-color);
+
+    &:hover {
+        text-decoration: underline;
+    }
+}
+
+@mixin scroll {
+    -webkit-overflow-scrolling: auto;
+
+    &::-webkit-scrollbar {
+        -webkit-appearance: none;
+        height: 5px;
+        width: 5px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background: var(--scrollbar);
+
+        &:hover {
+            background: color-mix(in srgb, var(--scrollbar), var(--invert) 15%);
+        }
+    }
+
+    &::-webkit-scrollbar-corner {
+        background: var(--border);
+    }
+}

package/app/styles/default.scss

@@ -1,85 +1,85 @@
-@use '$/def/size';
-
-//
-// Vars
-//
-
-:root
-{
-    --transitionSpeed: 200ms;
-    --transitionFunction: cubic-bezier(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);
-    }
+@use '$/def/size';
+
+//
+// Vars
+//
+
+:root
+{
+    --transitionSpeed: 200ms;
+    --transitionFunction: cubic-bezier(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/app/styles/partials/_darkMagic.scss

@@ -1,7 +1,7 @@
-@mixin replacer
-{
-    > div > div
-    {
-        @content;
-    }
+@mixin replacer
+{
+    > div > div
+    {
+        @content;
+    }
 }

package/app/styles/partials/_fnav.scss

@@ -1,18 +1,18 @@
-.frontNavSeparator
-{
-    --_space: calc(var(--gap) / 2);
-}
-
-.frontNavItem + .frontNavSeparator
-{
-    border-top: 1px solid var(--border);
-    margin-top: var(--_space);
-    padding-top: var(--_space);
-}
-
-.frontNavSeparator:has(+ .frontNavItem:not(.frontNavSeparator))
-{
-    border-bottom: 1px solid var(--border);
-    padding-bottom: var(--_space);
-    margin-bottom: var(--_space);
+.frontNavSeparator
+{
+    --_space: calc(var(--gap) / 2);
+}
+
+.frontNavItem + .frontNavSeparator
+{
+    border-top: 1px solid var(--border);
+    margin-top: var(--_space);
+    padding-top: var(--_space);
+}
+
+.frontNavSeparator:has(+ .frontNavItem:not(.frontNavSeparator))
+{
+    border-bottom: 1px solid var(--border);
+    padding-bottom: var(--_space);
+    margin-bottom: var(--_space);
 }

package/app/styles/partials/_preview.scss

@@ -1,7 +1,7 @@
-@mixin hasTheme
-{
-    [data-erudit-preview-theme] &
-    {
-        @content;
-    }
+@mixin hasTheme
+{
+    [data-erudit-preview-theme] &
+    {
+        @content;
+    }
 }

package/globalPath.ts

@@ -1,24 +1,21 @@
-import { fileURLToPath } from 'node:url';
-import { resolvePaths } from 'erudit-cog/kit';
-
-export const ERUDIT_DIR = resolvePaths(fileURLToPath(import.meta.url), '..');
-export const PROJECT_DIR = process.env.ERUDIT_PROJECT_DIR as string;
-
-console.log('ERUDIT_DIR: ', ERUDIT_DIR);
-
-export function eruditPath(path?: string) {
-    console.log('Erudit Path: ', path ? `${ERUDIT_DIR}/${path}` : ERUDIT_DIR);
-    return path ? `${ERUDIT_DIR}/${path}` : ERUDIT_DIR;
-}
-
-export function projectPath(path?: string) {
-    return path ? `${PROJECT_DIR}/${path}` : PROJECT_DIR;
-}
-
-export function eruditBuildPath(path?: string) {
-    return projectPath('.erudit' + (path ? '/' + path : ''));
-}
-
-export function eruditEndNuxtPath(path?: string) {
-    return eruditBuildPath('nuxt' + (path ? '/' + path : ''));
-}
+import { fileURLToPath } from 'node:url';
+import { resolvePaths } from 'erudit-cog/kit';
+
+export const ERUDIT_DIR = resolvePaths(fileURLToPath(import.meta.url), '..');
+export const PROJECT_DIR = process.env.ERUDIT_PROJECT_DIR as string;
+
+export function eruditPath(path?: string) {
+    return path ? `${ERUDIT_DIR}/${path}` : ERUDIT_DIR;
+}
+
+export function projectPath(path?: string) {
+    return path ? `${PROJECT_DIR}/${path}` : PROJECT_DIR;
+}
+
+export function eruditBuildPath(path?: string) {
+    return projectPath('.erudit' + (path ? '/' + path : ''));
+}
+
+export function eruditEndNuxtPath(path?: string) {
+    return eruditBuildPath('nuxt' + (path ? '/' + path : ''));
+}

package/globals/bitran.ts

@@ -1,27 +1,30 @@
-import type { GenericProductCore } from 'bitran/core';
-import type { ProductRender } from 'bitran/render';
+import type { GenericElementSchema } from '@bitran-js/core';
+import type { ElementTranspiler } from '@bitran-js/transpiler';
+import type { ElementVueRenderer } from '@bitran-js/renderer-vue';
 
-export interface ConfigProduct {
-    core: () => Promise<GenericProductCore>;
-    render: () => Promise<ProductRender>;
+export interface BitranElementConfig<
+    T extends GenericElementSchema = GenericElementSchema,
+> {
+    transpiler: () => Promise<ElementTranspiler<T>>;
+    renderer: () => Promise<ElementVueRenderer<T>>;
 }
 
-export type ConfigProducts = Record<string, ConfigProduct>;
+export type BitranElements = Record<string, BitranElementConfig>;
 
 export interface EruditBitranConfig<
-    TProducts extends ConfigProducts = ConfigProducts,
+    TElements extends BitranElements = BitranElements,
 > {
-    products: TProducts;
-    toc: (keyof TProducts)[];
+    elements: TElements;
+    toc: (keyof TElements)[];
 
     /**
      * TODO!
-     * Groups of products that are tracked on site, included in TOC, in search, display in front and book pages and so on.
+     * Groups of elements that are tracked on site, included in TOC, in search, display in front and book pages and so on.
      *
      * Example:
      * tracked: {
      *     term: {
-     *        products: ['definition', 'axiom'],
+     *        elements: ['definition', 'axiom'],
               title: 'Термин',
               toc: true,
               search: false,
@@ -29,11 +32,16 @@ export interface EruditBitranConfig<
      *     }
      * }
      */
-    tracked: any;
 }
 
-export function defineBitranConfig<T extends ConfigProducts>(
+export function defineBitranConfig<T extends BitranElements>(
     config: Partial<EruditBitranConfig<T>>,
 ) {
     return config;
 }
+
+export function defineBitranElement<T extends GenericElementSchema>(
+    config: BitranElementConfig<T>,
+) {
+    return config;
+}

package/globals/erudit.ts

@@ -1,5 +1,5 @@
-import type { EruditConfig } from 'erudit-cog/schema';
-
-export function defineEruditConfig(eruditConfig: Partial<EruditConfig>) {
-    return eruditConfig;
-}
+import type { EruditConfig } from 'erudit-cog/schema';
+
+export function defineEruditConfig(eruditConfig: Partial<EruditConfig>) {
+    return eruditConfig;
+}

package/globals/register.ts

@@ -1,18 +1,18 @@
-import * as erudit from './erudit';
-import * as contributor from './contributor';
-import * as bitran from './bitran';
-import * as content from './content';
-import * as asset from '@shared/asset';
-
-export function registerGlobals() {
-    for (const [key, value] of Object.entries({
-        ...erudit,
-        ...contributor,
-        ...bitran,
-        ...content,
-        ...asset,
-    })) {
-        // @ts-ignore
-        globalThis[key] = value;
-    }
-}
+import * as erudit from './erudit';
+import * as contributor from './contributor';
+import * as bitran from './bitran';
+import * as content from './content';
+import * as asset from '@shared/asset';
+
+export function registerGlobals() {
+    for (const [key, value] of Object.entries({
+        ...erudit,
+        ...contributor,
+        ...bitran,
+        ...content,
+        ...asset,
+    })) {
+        // @ts-ignore
+        globalThis[key] = value;
+    }
+}