@diplodoc/cli-tests 0.0.0-rc-liquid-conditions-saving-202509050811 → 0.0.0-rc-disable-resolve-codeblock-17941220955

package/e2e/alternates.test.ts

@@ -0,0 +1,34 @@
+import {describe, it} from 'vitest';
+import {TestAdapter, compareDirectories, getTestPaths} from '../fixtures';
+
+describe('Alternates', () => {
+    it('skip-html-extension', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/alternates');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+            args: '-j2 --skip-html-extension',
+        });
+
+        await compareDirectories(outputPath);
+    });
+
+    it('internal', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/alternates');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '-j2',
+        });
+        await TestAdapter.testBuildPass(outputPath, outputPath + '-html', {
+            md2md: false,
+            md2html: true,
+            args: '-j2',
+        });
+
+        await compareDirectories(outputPath);
+        await compareDirectories(outputPath + '-html');
+    });
+});

package/e2e/bundles.spec.ts

@@ -0,0 +1,15 @@
+import {describe, it} from 'vitest';
+import {TestAdapter, compareDirectories, getTestPaths} from '../fixtures';
+
+describe('Check bundles', () => {
+    it('bundles list is correct', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/bundles');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+            args: '-j2',
+        });
+        await compareDirectories(outputPath, false, true);
+    });
+});

package/e2e/preprocess.test.ts

@@ -29,5 +29,9 @@ describe('Preprocess', () => {
 
     generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=true', 'mocks/preprocess');
 
+    generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=true,Svg=true', 'mocks/preprocess', [
+        '--merge-svg'
+    ]);
+
     // generateFilesYamlTestTemplate('Nested toc restricted access', 'mocks/preprocess/test3');
 });

package/e2e/single-page.spec.ts

@@ -0,0 +1,22 @@
+import {describe, test} from 'vitest';
+import {TestAdapter, compareDirectories, getTestPaths} from '../fixtures';
+
+const generateMapTestSinglePageTemplate = (
+    testTitle: string,
+    testRootPath: string,
+    {md2md = true, md2html = true, args = '--single-page'},
+) => {
+    test(testTitle, async () => {
+        const {inputPath, outputPath} = getTestPaths(testRootPath);
+        await TestAdapter.testBuildPass(inputPath, outputPath, {md2md, md2html, args});
+        await compareDirectories(outputPath);
+    });
+};
+
+describe('Single page mode', () => {
+    generateMapTestSinglePageTemplate(
+        'simple md2html single page with lang dirs',
+        'mocks/single-page',
+        {md2md: false},
+    );
+});

package/e2e/translation.spec.ts

@@ -37,7 +37,7 @@ const buildFilesYamlTestTemplate = (
 ) => {
     test(testTitle, async () => {
         const {inputPath, outputPath} = getTestPaths(testRootPath);
-        const {md2md, md2html} =buildProps;
+        const {md2md, md2html} = buildProps;
 
         await TestAdapter.testBuildPass(inputPath, outputPath, {md2html, md2md});
 
@@ -108,30 +108,4 @@ describe('Translate command', () => {
         source: 'ru-RU',
         target: 'en-US',
     });
-
-    let conditionVars = {prod: true, inner: true, list: ['item']};
-    generateMapTestTemplate(
-        'save truthy liquid conditions structures',
-        'mocks/translation/conditions',
-        {
-            subcommand: 'extract',
-            source: 'ru-RU',
-            target: 'es-ES',
-            additionalArgs: `--vars ${JSON.stringify(conditionVars)}`,
-        },
-        false,
-    );
-
-    conditionVars = {prod: false, inner: false, list: ['item']};
-    generateMapTestTemplate(
-        'remove falsy liquid conditions structures',
-        'mocks/translation/conditions',
-        {
-            subcommand: 'extract',
-            source: 'ru-RU',
-            target: 'es-ES',
-            additionalArgs: `--vars ${JSON.stringify(conditionVars)}`,
-        },
-        false,
-    );
 });

package/fixtures/utils/file.ts

@@ -5,14 +5,38 @@ import {glob} from 'glob';
 import {bundleless, hashless, platformless} from './test';
 import {expect} from 'vitest';
 
+const SYSTEM_DIRS = ['_bundle/', '_search/'];
+
 export function getFileContent(filePath: string) {
     return platformless(bundleless(readFileSync(filePath, 'utf8')));
 }
 
-const uselessFile = (file: string) =>
-    !['_bundle/', '_assets/', '_search/'].some((part) => file.includes(part));
+const uselessFile = (file: string, dirs: string[]) =>
+    !dirs.some((part) => file.includes(part));
+
+export function stripSystemLinks(content: string) {
+    const dirPattern = SYSTEM_DIRS.map(d => d.replace('/', '\\/')).join('|');
+
+    content = content.replace(
+        new RegExp(`<script[^>]+src="(?:${dirPattern})[^"]*"[^>]*></script>`, 'g'),
+        ''
+    );
+
+    content = content.replace(
+        new RegExp(`<link[^>]+href="(?:${dirPattern})[^"]*"[^>]*\\/?>`, 'g'),
+        ''
+    );
+
+    content = content.replace(/^[ \t]*\r?\n/gm, '');
+
+    return content;
+}
 
-export async function compareDirectories(outputPath: string, ignoreFileContent = false) {
+export async function compareDirectories(
+    outputPath: string,
+    ignoreFileContent = false,
+    checkBundle = false,
+) {
     const filesFromOutput = (
         await glob(`**/*`, {
             cwd: outputPath,
@@ -23,11 +47,30 @@ export async function compareDirectories(outputPath: string, ignoreFileContent =
         })
     ).map(bundleless).sort();
 
-    expect(hashless(JSON.stringify(filesFromOutput, null, 2))).toMatchSnapshot('filelist');
+    let filesForSnapshot;
+
+    if (checkBundle) {
+        filesForSnapshot = filesFromOutput;
+    } else {
+        filesForSnapshot = filesFromOutput.filter(file => uselessFile(file, SYSTEM_DIRS));
+    }
+
+    // Here we sort the order of the included files after all processing
+    // This is necessary for better test stability
+    // We do not care in what order these files were received and processed
+    // We sort only the final list and put it in the snapshot
+    filesForSnapshot = filesForSnapshot.map(hashless).sort(); 
+
+    expect(JSON.stringify(filesForSnapshot, null, 2)).toMatchSnapshot('filelist');
 
     if (!ignoreFileContent) {
-        filesFromOutput.filter(uselessFile).forEach((filePath) => {
-            const content = getFileContent(resolve(outputPath, filePath));
+        filesFromOutput.filter(file => uselessFile(file, ['_assets/', ...SYSTEM_DIRS])).forEach((filePath) => {
+            let content = getFileContent(resolve(outputPath, filePath));
+
+            if (!checkBundle && filePath.endsWith('.html')) {
+                content = stripSystemLinks(content);
+            }
+
             expect(content).toMatchSnapshot();
         });
     }

package/fixtures/utils/test.ts

@@ -1,3 +1,4 @@
+
 import assets from '@diplodoc/cli/manifest';
 
 export function platformless(text: string): string {
@@ -25,6 +26,7 @@ export function platformless(text: string): string {
 export function hashless(text: string): string {
     return text
         .replace(/-[a-z0-9]{12}\./g, '-hash.')
+        .replace(/rnd-[a-z0-9]{1,8}__/g, 'rnd-hash__')
         .replace(/(\/|\\)[a-z0-9]{12,13}-(index|registry|resources)\./g, '/hash-$2.');
 }
 

package/mocks/alternates/input/.yfm

@@ -0,0 +1 @@
+langs: ['ru', 'en', 'az']

package/mocks/alternates/input/az/about.md

@@ -0,0 +1,3 @@
+# About
+
+Content

package/mocks/alternates/input/az/deep/test.md

@@ -0,0 +1,3 @@
+# Test
+
+Content

package/mocks/alternates/input/az/index.yaml

@@ -0,0 +1,3 @@
+links:
+  - url: ./about
+    name: About

package/mocks/alternates/input/az/toc.yaml

@@ -0,0 +1,6 @@
+href: index.yaml
+items:
+  - href: about.md
+    name: About
+  - href: deep/test.md
+    name: Test

package/mocks/alternates/input/en/about.md

@@ -0,0 +1,3 @@
+# About
+
+Content

package/mocks/alternates/input/en/deep/test.md

@@ -0,0 +1,3 @@
+# Test
+
+Content

package/mocks/alternates/input/en/index.yaml

@@ -0,0 +1,3 @@
+links:
+  - url: ./about
+    name: About

package/mocks/alternates/input/en/toc.yaml

@@ -0,0 +1,6 @@
+href: index.yaml
+items:
+  - href: about.md
+    name: About
+  - href: deep/test.md
+    name: Test

package/mocks/alternates/input/ru/about.md

@@ -0,0 +1,8 @@
+---
+alternate:
+  - https://my-other-site.com/about
+---
+
+# About
+
+Content

package/mocks/alternates/input/ru/deep/test.md

@@ -0,0 +1,3 @@
+# Test
+
+Content

package/mocks/alternates/input/ru/index.yaml

@@ -0,0 +1,3 @@
+links:
+  - url: ./about
+    name: About

package/mocks/alternates/input/ru/toc.yaml

@@ -0,0 +1,6 @@
+href: index.yaml
+items:
+  - href: about.md
+    name: About
+  - href: deep/test.md
+    name: Test

package/mocks/bundles/input/.yfm

@@ -0,0 +1,13 @@
+allowHTML: true
+
+meta:
+  rootPath: http://127.0.0.1:5000/
+
+interface:
+  toc-header: false
+  favicon-src: https://storage.yandexcloud.net/diplodoc-www-assets/favicon/favicon.ico
+
+search:
+  provider: local
+  tolerance: 2
+  confidense: phrased

package/mocks/bundles/input/index.md

@@ -0,0 +1,12 @@
+---
+  availableLangs:
+    - en
+    - ru
+---
+
+# Header
+
+Content
+
+[Link 1](page1.md)
+[Link 2](page2.md)

package/mocks/bundles/input/page1.md

@@ -0,0 +1,3 @@
+# Page 1
+
+[Link](page2.md#hash)

package/mocks/bundles/input/page2.md

@@ -0,0 +1,5 @@
+# Page 2
+
+## hash
+
+[External link](https://example.com)

package/mocks/bundles/input/toc.yaml

@@ -0,0 +1,9 @@
+title: Skip html extension
+href: index.md
+
+items:
+  - name: Title 1
+    href: page1.md
+  - name: Title 2
+    href: page2.md
+    

package/mocks/errors/extract-filtered-link/input/index.md

@@ -4,4 +4,4 @@
 
 [second missed link](./filtered2.md)
 [second missed link](./filtered2.md)
-[second missed link](./filtered3.md)
+[second missed link](./filtered3.md)

package/mocks/preprocess/input/_assets/1.svg

@@ -0,0 +1,15 @@
+<svg width="20px" height="20px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" id="search" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="search_1_">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="57.9473" x2="407.9511" y1="351.4531" y2="149.3783">
+<stop offset="0" stop-color="#F14D5C"/>
+<stop offset="0.1309" stop-color="#F05454"/>
+<stop offset="0.3346" stop-color="#3bf488"/>
+<stop offset="0.3492" stop-color="#ED683C"/>
+<stop offset="0.714" stop-color="#1e15a3"/>
+<stop offset="1" stop-color="#FDC70C"/>
+</linearGradient>
+<path d="M300.766,87.509c-33.056,0-64.133,12.873-87.507,36.246c-23.374,23.374-36.247,54.451-36.247,87.507   c0,24.234,6.927,47.4,19.83,67.252l-12.669,12.669c0,0.001-0.001,0.001-0.001,0.001l-90.664,90.665   c-8.353,8.354-7.88,22.418,1.055,31.353l4.261,4.262c4.669,4.668,10.736,7.028,16.658,7.028c5.417,0,10.713-1.976,14.703-5.966   l15.405-15.405l75.259-75.259l12.671-12.672c19.85,12.9,43.014,19.826,67.246,19.826c33.056,0,64.133-12.873,87.506-36.247   c48.252-48.251,48.252-126.762,0-175.014C364.898,100.382,333.821,87.509,300.766,87.509z M138.518,396.049   c-4.454,4.453-12.178,3.979-17.219-1.063l-4.261-4.262c-5.036-5.035-5.509-12.756-1.055-17.21l71.38-71.38   c3.284,4.164,6.834,8.16,10.601,11.926c3.766,3.766,7.764,7.318,11.935,10.607L138.518,396.049z M105.894,410.391l-4.261-4.26   c-5.036-5.036-5.509-12.757-1.055-17.211l2.902-2.902c0.936,4.27,3.101,8.393,6.486,11.779l4.261,4.26   c3.392,3.393,7.523,5.549,11.799,6.483l-2.914,2.914C118.658,415.908,110.934,415.432,105.894,410.391z M213.788,320.779   c0.002-0.003,0.005-0.006,0.007-0.008l0,0L213.788,320.779z M217.033,317.534c-4.201-3.248-8.229-6.775-11.998-10.544   c-3.771-3.771-7.295-7.797-10.537-11.99l8.214-8.214c3.233,4.181,6.749,8.185,10.547,11.982c3.8,3.8,7.806,7.317,11.989,10.552   L217.033,317.534z M381.201,291.697c-21.485,21.485-50.052,33.318-80.436,33.318c-30.385,0-58.951-11.833-80.436-33.318   c-21.485-21.484-33.318-50.051-33.318-80.436s11.833-58.95,33.318-80.436c21.485-21.485,50.051-33.317,80.436-33.317   c30.384,0,58.95,11.832,80.436,33.317C425.553,175.179,425.553,247.346,381.201,291.697z" fill="url(#SVGID_1_)"/>
+<path d="M258.117,115.27l3.604,9.328c2.592-1.001,5.267-1.887,7.949-2.632l-2.676-9.636   C263.998,113.162,261.012,114.151,258.117,115.27z" fill="#3bf488ff"/>
+<path d="M206.264,162.886l8.985,4.389c8.299-16.992,22.191-30.997,39.118-39.433l-4.46-8.95   C231.022,128.304,215.523,143.928,206.264,162.886z" fill="#1e15a3ff"/>
+</g>
+</svg>

package/mocks/preprocess/input/autotitle.md

@@ -3,6 +3,8 @@
 Empty title
 [](./1.md)
 
+### Uploading Attributes via Import File {#create-attribute-with-template}
+
 Empty subtitle
 [](./1.md#subtitle)
 
@@ -18,6 +20,17 @@ Empty local title
 Special local title
 [{#T}](#header)
 
+Reference link
+[{#T}][link]
+
+Reference link with hash
+[{#T}][link-with-hash]
+
+[link]: ./mermaid.md
+[link-with-hash]: ./1.md#subtitle
+
 ## Header {#header}
 
 Content
+
+#### Step 1. Follow the steps described in the [{#T}](#create-attribute-with-template) section

package/mocks/preprocess/input/images.md

@@ -1,5 +1,96 @@
-# Images
+# Images ![svg image 1](_assets/1.svg)
 
 ![simple image](_assets/1.png)
 
+<!-- ![comm svg image 1](_assets/1.svg) -->
+1. `![code svg image 1](_assets/1.svg)`
+![svg image 11](_assets/1.svg)
 
+<!-- ![comm svg image 2](_assets/1.svg "Mountain" =100x200) -->
+2. `![code svg image 2](_assets/1.svg "Mountain" =100x200)`
+![svg image 2](_assets/1.svg "Mountain" =100x200)
+
+<!-- ![comm reference image 3][image1] -->
+3. `![code reference image 3][image1]`
+![reference image 3][image1]
+
+4. `![code image1][]`
+![image1][]
+
+[image1]: _assets/1.svg "Svg"
+
+<!-- [![comm svg image 4](_assets/1.svg)](https://yandex.com/images/search?text=mountain) -->
+5. `[![code svg image 4](_assets/1.svg)](https://yandex.com/images/search?text=mountain)`
+[![svg image 4](_assets/1.svg)](https://yandex.com/images/search?text=mountain)
+
+<!-- [![comm svg image 5](_assets/1.svg "Title"){width=100 height=200}](https://yandex.com/images/search?text=mountain) -->
+6. `[![code svg image 5](_assets/1.svg "Title"){width=100 height=200}](https://yandex.com/images/search?text=mountain)`
+[![svg image 5](_assets/1.svg "Title"){width=100 height=200}](https://yandex.com/images/search?text=mountain)
+
+
+7. `![title][code]{width=100 height=200}`
+![title][code]{width=100 height=200}
+
+8. `![code][]{width=100}`
+![code][]{width=100}
+
+[code]: _assets/1.svg
+
+9. `[![code Source Code][badge-source]][source]`
+[![Source Code][badge-source]][source]
+
+10. `![no inline for reference][png]`
+![no inline for reference][png]
+
+[badge-source]: _assets/1.svg
+[png]: _assets/1.png
+[source]: https://github.com/ramsey/uuid/tree/3.x
+
+11. Definition list 
+Term
+:   Definition with 
+
+    ![img](_assets/1.svg)
+    and more text
+
+20. Сodeblocks - no inline svg
+```
+Codeblock fence
+![code svg image 10.1](_assets/1.svg)
+```
+
+````
+Codeblock in codeblock
+```
+![code svg image 10.2](_assets/1.svg)
+```
+![code svg image 10.2](_assets/1.svg)
+````
+
+~~~
+Codeblock tilda
+![code svg image 10.3](_assets/1.svg)
+~~~
+
+```````md translate=no
+Codeblock 10 fence
+![code svg image 10.4](_assets/1.svg)
+```````
+
+    Codeblock 4 spaces
+    ![code svg image 10.5](_assets/1.svg)
+    row 3
+
+1. Codeblock 4 spaces in list
+
+        ![code svg image 10.6](_assets/1.svg)
+1. Codeblock fence in list with bad gap
+  ```
+  ![code svg image 10.7](_assets/1.svg)
+  ```
+
+```md
+Codeblock with inline code
+   `![code svg image 22](_assets/1.svg)`
+1. ![code svg image 23](_assets/1.svg)
+```

package/mocks/regression/input/autotitle.md

@@ -18,6 +18,9 @@ Empty local title
 Special local title
 [{#T}](#header)
 
+Circular title
+[{#T}](./autotitle.md#header)
+
 ## Header {#header}
 
 Content

package/mocks/single-page/input/ru/index.yaml

@@ -0,0 +1,9 @@
+title: Documentation
+description: ""
+meta:
+  title: Documentation
+  noIndex: true
+links:
+  - title: Getting started with Documentation
+    description: This guide will show you the basics of working with Documentation
+    href: page.md

package/mocks/single-page/input/ru/page.md

@@ -0,0 +1,14 @@
+---
+title: Page Title
+description: Some test description
+
+interface:
+  toc: false
+  favicon-src: /favicon.ico
+
+metadata:
+  - name: yfm
+    content: builder in page
+---
+
+Lorem

package/mocks/single-page/input/ru/project/config.md

@@ -0,0 +1 @@
+Lorem

package/mocks/single-page/input/ru/toc.yaml

@@ -0,0 +1,7 @@
+title: Documentation
+href: index.yaml
+items:
+  - name: Documentation
+    href: page.md
+  - name: Config
+    href: project/config.md

package/mocks/translation/dir-files/input/ru/nested/toc.yaml

@@ -5,15 +5,15 @@ items:
     href: index.yaml
   - include: {mode: merge, path: folder1/toc-i.yaml}
   - name: Yandex Flavored Markdown
-    href: index-yfm.md
+    href:
     items:
       - name: Синтаксис
         items:
           - name: Обзор
             href: syntax/index.md
-            when: test == "nested"
           - name: Базовая разметка
             href: syntax/base.md
           - name: Списки
             href: syntax/lists.md
-          - name: Таблицы
+  - name: Was filtered above
+    href: use_filtered_above.md

package/mocks/translation/dir-files/input/ru/nested/use_filtered_above.md

@@ -0,0 +1,4 @@
+### Theese links were filtered
+
+[test2](./syntax/base.md)
+[test3](./syntax/lists.md)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/cli-tests",
-  "version": "0.0.0-rc-liquid-conditions-saving-202509050811",
+  "version": "0.0.0-rc-disable-resolve-codeblock-17941220955",
   "bin": {
     "diplodoc-cli-test": "bin.mjs"
   },

package/mocks/translation/conditions/input/index.md

@@ -1,37 +0,0 @@
-[existing file](./exists.md)
-<!-- [missed file](./missed.md) -->
-{% if prod == true %}Test text{% endif %}
-
-{% if inner == true %}inner test text{% endif %}
-
-{% if prod == true %}Test text{% if inner == true %}inner test text{% endif %}{% endif %}
-
-{% if prod == true %}
-
-    {% if list contains "item" %}
-
-    #### List
-
-    {% if item == true %}1. Item {% endif %}
-
-    Some text
-
-    {% endif %}
-
-{% endif %}
-
-#### Standalone contains condition
-
-{% if list contains "item" %}
-
-    #### List
-
-{% endif %}
-
-#### Inline contains condition
-
-{% if  prod == true %}
-
-    #### List {% if list contains "item" %} sub text {% endif %}
-
-{% endif %}