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

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/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

@@ -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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/cli-tests",
-  "version": "0.0.0-rc-liquid-conditions-saving-202509050811",
+  "version": "0.0.0-rc-resolve-codeblock-202509151421",
   "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 %}