@diplodoc/cli-tests 5.35.3 → 5.36.1

package/e2e/merge-includes.spec.ts

@@ -53,7 +53,7 @@ describe('Merge includes (md2md)', () => {
         await TestAdapter.testBuildPass(inputPath, outputPath, {
             md2md: true,
             md2html: false,
-            args: '--merge-includes',
+            args: '--merge-includes --multiline-term-definitions',
         });
         await compareDirectories(outputPath);
     });
@@ -69,6 +69,50 @@ describe('Merge includes (md2md)', () => {
         await compareDirectories(outputPath);
     });
 
+    test('term-extract: dep with terms → terms extracted, content inlined (Step 4)', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/term-extract');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes --multiline-term-definitions',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('yfm-table: include followed by || separator is inlined', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/yfm-table');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('html-in-list: include with <style> in list (any indent) uses fallback', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/html-in-list');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('hash-section-html: hash-section include in list is inlined when only other section has <style>', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/hash-section-html');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
     test('without flag: includes are NOT merged', async () => {
         const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/basic');
 

package/e2e/pdf-page.spec.ts

@@ -98,3 +98,30 @@ describe('Pdf generation with md2md phase, only files structure', () => {
         'mocks/pdf-page/title-pages',
     );
 });
+
+describe('Pdf page with custom icon', () => {
+    test('md2md copies custom pdf icon asset to output', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/pdf-page/custom-pdf-icon');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--allow-custom-resources',
+        });
+
+        await compareDirectories(outputPath, true);
+        await cleanupDirectory(outputPath);
+    });
+
+    test('md2html copies all files and produces correct pdfIconConfig in __DATA__', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/pdf-page/custom-pdf-icon');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+        });
+
+        await compareDirectories(outputPath);
+        await cleanupDirectory(outputPath);
+    });
+});

package/e2e/preprocess.test.ts

@@ -12,12 +12,12 @@ const generateFilesYamlTestTemplate = (
         await TestAdapter.testBuildPass(inputPath, outputPath, {
             md2md: true,
             md2html: false,
-            args: args.concat(['--keep-not-var']).join(' '),
+            args: args.concat(['--keep-not-var', '--id-generator', 'deterministic']).join(' '),
         });
         await TestAdapter.testBuildPass(outputPath, outputPath + '-html', {
             md2md: false,
             md2html: true,
-            args: args.join(' '),
+            args: args.concat(['--id-generator', 'deterministic']).join(' '),
         });
         await compareDirectories(outputPath);
     });

package/e2e/regression.test.ts

@@ -10,17 +10,17 @@ function test(_description: string) {
         await TestAdapter.testBuildPass(inputPath, outputPath, {
             md2md: true,
             md2html: false,
-            args: '-j2 --keep-not-var --add-system-meta',
+            args: '-j2 --keep-not-var --add-system-meta --id-generator deterministic',
         });
         await TestAdapter.testBuildPass(outputPath, outputPath + '-html', {
             md2md: false,
             md2html: true,
-            args: '-j2',
+            args: '-j2 --id-generator deterministic',
         });
         await TestAdapter.testBuildPass(outputPath, outputPath + '-static-html', {
             md2md: false,
             md2html: true,
-            args: '-j2 --static-content',
+            args: '-j2 --static-content --id-generator deterministic',
         });
         await compareDirectories(outputPath);
         await compareDirectories(outputPath + '-html');

package/fixtures/utils/test.ts

@@ -31,35 +31,125 @@ export function platformless(text: string): string {
 export function hashless(text: string): string {
     return text
         .replace(/-[a-z0-9]{12,16}\./g, '-hash.')
-        .replace(/rnd-[a-z0-9]{1,8}__/g, 'rnd-hash__')
+        .replace(/(rnd|svg)-[a-z0-9]{3,8}__/g, 'rnd-hash__')
         .replace(/(\/|\\)[a-z0-9]{12,16}-(index|registry|resources)\./g, '/hash-$2.');
 }
 
+/**
+ * Replaces hashed bundle filenames from the client manifest with stable labels
+ * and sorts bundle references to normalize platform-dependent ordering.
+ *
+ * Examples: "app-3ff8bc0b40bc2914.js" → "app-js",
+ *           "vendor-00121562c7b7d3b5.rtl.css" → "vendor-rtl-css",
+ *           "976-40cbc1d2518eb8ea.js" → "chunk-js" (numeric webpack chunk ID).
+ */
 export function bundleless(text: string): string {
-    for (const [entryKey, entry] of Object.entries(assets)) {
-        for (const [typeKey, type] of Object.entries(entry)) {
-            for (let index = 0; index < type.length; index++) {
-                // Extract base name from manifest filename (e.g. "app-3ff8bc0b40bc2914.js" -> "app")
-                // Also handles suffixes like "vendor-00121562c7b7d3b5.rtl.css" -> base="vendor", suffix=".rtl", ext="css"
-                const filename = type[index];
-                const match = filename.match(/^(.+?)-[a-z0-9]{12,16}(\.[a-z]+)*\.([a-z]+)$/);
-                if (!match) {
-                    // Fallback: exact string replacement for filenames without hash pattern
-                    let prev = '';
-                    while (prev !== text) {
-                        prev = text;
-                        text = text.replace(filename, `${entryKey}-${typeKey}-${index}`);
-                    }
-                    continue;
-                }
-
-                const [, base, suffixes, ext] = match;
-                const suffixPattern = suffixes ? suffixes.replace(/\./g, '\\.') : '';
-                const pattern = new RegExp(`${base}-[a-z0-9]{12,16}${suffixPattern}\\.${ext}`, 'g');
-                text = text.replace(pattern, `${entryKey}-${typeKey}-${index}`);
+    // On Windows the CLI may emit `_bundle\file` or JSON-escaped `_bundle\\/file`.
+    // Collapse any mix of backslashes and forward slashes after `_bundle` into `/`.
+    text = text.replace(/_bundle[/\\]+/g, '_bundle/');
+
+    for (const entry of Object.values(assets)) {
+        for (const files of Object.values(entry)) {
+            for (const filename of files) {
+                const match = filename.match(
+                    /^([a-z0-9]+)-[a-f0-9]{12,16}((?:\.[a-z]+)*)\.([a-z]+)$/,
+                );
+                if (!match) continue;
+
+                const [, rawBase, suffixes, ext] = match;
+                const base = /^\d+$/.test(rawBase) ? 'chunk' : rawBase;
+                const suffixPart = suffixes.replace(/\./g, '-').slice(1); // ".rtl" → "rtl"
+                const label = suffixPart ? `${base}-${suffixPart}-${ext}` : `${base}-${ext}`;
+                const escapedSuffixes = suffixes.replace(/\./g, '\\.');
+                const pattern = new RegExp(
+                    `${rawBase}-[a-f0-9]{12,16}${escapedSuffixes}\\.${ext}`,
+                    'g',
+                );
+                text = text.replace(pattern, label);
             }
         }
     }
 
+    return sortBundleTokens(text);
+}
+
+/**
+ * Sorts contiguous runs of `_bundle/` references so snapshots stay stable
+ * regardless of manifest ordering or platform.
+ *
+ * Pass 1 (line-level): sorts groups of consecutive lines containing `_bundle/`
+ * — handles HTML `<link>` / `<script>` tags on separate lines.
+ *
+ * Pass 2 (inline): sorts groups of `_bundle/` tokens on the same line separated
+ * only by punctuation — handles JSON arrays like `"cssLink":["_bundle/b","_bundle/a"]`.
+ */
+function sortBundleTokens(text: string): string {
+    const bundleRe = /_bundle\/[a-z0-9][-a-z0-9]*/;
+
+    // --- Pass 1: line-level sort ---
+    const lines = text.split('\n');
+    let i = 0;
+    while (i < lines.length) {
+        if (!bundleRe.test(lines[i])) {
+            i++;
+            continue;
+        }
+        const start = i;
+        while (i < lines.length && bundleRe.test(lines[i])) {
+            i++;
+        }
+        if (i - start < 2) continue;
+
+        const slice = lines.slice(start, i);
+        const sorted = [...slice].sort((a, b) => {
+            const ka = a.match(bundleRe)?.[0] ?? '';
+            const kb = b.match(bundleRe)?.[0] ?? '';
+            return ka < kb ? -1 : ka > kb ? 1 : 0;
+        });
+        for (let j = 0; j < sorted.length; j++) {
+            lines[start + j] = sorted[j];
+        }
+    }
+    text = lines.join('\n');
+
+    // --- Pass 2: inline sort (JSON arrays, etc.) ---
+    const tokenRe = /_bundle\/[a-z0-9][-a-z0-9]*/g;
+    const hits: {start: number; end: number; value: string}[] = [];
+    let m;
+    while ((m = tokenRe.exec(text)) !== null) {
+        hits.push({start: m.index, end: m.index + m[0].length, value: m[0]});
+    }
+    if (hits.length < 2) return text;
+
+    // Gap between two tokens is "glue" when it contains no alphanumeric chars
+    // (ignoring `_bundle` substrings that may appear in the gap).
+    const isGlue = (gap: string) => !/[a-zA-Z0-9]/.test(gap.replace(/_bundle/g, ''));
+
+    // Group consecutive same-line tokens into runs.
+    const runs: number[][] = [[0]];
+    for (let idx = 1; idx < hits.length; idx++) {
+        const gap = text.slice(hits[idx - 1].end, hits[idx].start);
+        if (!gap.includes('\n') && isGlue(gap)) {
+            runs[runs.length - 1].push(idx);
+        } else {
+            runs.push([idx]);
+        }
+    }
+
+    // Sort each run with 2+ tokens, rewriting from the end to preserve offsets.
+    for (let r = runs.length - 1; r >= 0; r--) {
+        const run = runs[r];
+        if (run.length < 2) continue;
+
+        const values = run.map((idx) => hits[idx].value);
+        const sorted = [...values].sort();
+        if (values.every((v, idx) => v === sorted[idx])) continue;
+
+        for (let k = run.length - 1; k >= 0; k--) {
+            const {start: s, end: e} = hits[run[k]];
+            text = text.slice(0, s) + sorted[k] + text.slice(e);
+        }
+    }
+
     return text;
 }

package/mocks/merge-includes/hash-section-html/input/_includes/mixed.md

@@ -0,0 +1,11 @@
+## Section with style {#with-style}
+
+<style>
+.highlight { background: yellow; }
+</style>
+
+Some styled content.
+
+## Section without style {#no-style}
+
+Just plain text content without any HTML blocks.

package/mocks/merge-includes/hash-section-html/input/index.md

@@ -0,0 +1,3 @@
+# Index
+
+Welcome page.

package/mocks/merge-includes/hash-section-html/input/main.md

@@ -0,0 +1,13 @@
+# Main Document
+
+Content before list.
+
+1. First item
+
+2. Second item with hash-section include (section has no HTML, but other section in same file does):
+
+   {% include notitle [no-style](_includes/mixed.md#no-style) %}
+
+3. Third item
+
+Content after list.

package/mocks/merge-includes/hash-section-html/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Merge Includes Hash Section HTML
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/html-in-list/input/_includes/styles.md

@@ -0,0 +1,7 @@
+<style>
+
+.yfm .highlight {
+    background: yellow;
+}
+
+</style>

package/mocks/merge-includes/html-in-list/input/index.md

@@ -0,0 +1,3 @@
+# Index
+
+Welcome page.

package/mocks/merge-includes/html-in-list/input/main.md

@@ -0,0 +1,11 @@
+# Main Document
+
+Content before list.
+
+- List item with inline include (any non-zero indent → HTML block must use fallback)
+
+   {% include [styles](_includes/styles.md) %}
+
+- Another list item
+
+Content after list.

package/mocks/merge-includes/html-in-list/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Merge Includes HTML in List
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/term-extract/input/_includes/chapter.md

@@ -0,0 +1,7 @@
+## Chapter
+
+Chapter content with [link](./local.md).
+
+[*api]: Application Programming Interface
+
+[*sdk]: Software Development Kit

package/mocks/merge-includes/term-extract/input/index.md

@@ -0,0 +1,3 @@
+# Index
+
+Welcome page.

package/mocks/merge-includes/term-extract/input/main.md

@@ -0,0 +1,7 @@
+# API Docs
+
+Use the [API](*api) and [SDK](*sdk) to build apps.
+
+{% include [chapter](_includes/chapter.md) %}
+
+[*api]: Application Programming Interface

package/mocks/merge-includes/term-extract/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Merge Includes Term Extract
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/yfm-table/input/_includes/cell-content.md

@@ -0,0 +1 @@
+Buy now at [our store](https://example.com/store).

package/mocks/merge-includes/yfm-table/input/index.md

@@ -0,0 +1,3 @@
+# Index
+
+Welcome page.

package/mocks/merge-includes/yfm-table/input/main.md

@@ -0,0 +1,12 @@
+# Main Document
+
+#|
+|| **Option** | **Details** ||
+|| Option A |
+Some description of option A.
+
+{% include [cell](_includes/cell-content.md) %}||
+|| Option B | Plain text cell. ||
+|#
+
+Content after table.

package/mocks/merge-includes/yfm-table/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Merge Includes YFM Table
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/pdf-page/custom-pdf-icon/input/.yfm

@@ -0,0 +1,6 @@
+pdf:
+    enabled: true
+    size: M
+    position: header
+    icon: _assets/custom-pdf-icon.svg
+    pdfFileUrl: pdf/output.pdf

package/mocks/pdf-page/custom-pdf-icon/input/_assets/custom-pdf-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" aria-hidden="true" class="g-icon Item-module__gn-composite-bar-item__collapse-item-icon___CD-ao"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="#657B8F" d="M7.181 13.318h3.887v2.045H5.136V5.341h2.045zm7.774-6.955h-3.683v4.705H9.227v-6.75h3.682V2.682h-9.41V5.34H1.456V.637h13.5z"/></svg></svg>

package/mocks/pdf-page/custom-pdf-icon/input/index.md

@@ -0,0 +1 @@
+# PDF mock index

package/mocks/pdf-page/custom-pdf-icon/input/toc.yaml

@@ -0,0 +1,2 @@
+title: Pdf custom link
+href: index.md

package/mocks/regression/input/autotitle.md

@@ -21,6 +21,38 @@ Special local title
 Circular title
 [{#T}](./autotitle.md#header)
 
+Autotitle from include
+<!-- [{#T}](includes/fragments.md#f3) -->
+
+Include with autotitle
+<!-- {% include [test](includes/fragments.md#f4) %} -->
+
+link with [some local term1](*term1-1)
+
+{% list tabs %}
+
+- Название таба 1
+
+  Текст таба 1.
+
+  * Можно использовать списки.
+  * И **другую** разметку.
+
+- Название таба 2
+
+  Текст таба 2.
+
+{% endlist %}
+
+All fragments
+
+{% include [test](includes/fragments.md) %}
+
+
 ## Header {#header}
 
-Content
+Content2
+
+{% include [test](includes/styles.md) %}
+
+[*term1-1]: {% include [test](includes/fragments.md#f3) %}

package/mocks/regression/input/includes/fragments.md

@@ -15,3 +15,27 @@ Some paragraph with anchor {#p1}
 Some paragraph without anchor
 
 Some paragraph with anchor {#p2}
+
+## F4 {#f4}
+Content F4
+[{#T}](../autotitle.md#header)
+
+### F4.1 {#f4.1}
+link with [some term1](*term1)
+
+{% list tabs %}
+
+- Название таба 1
+
+  Текст таба 1.
+
+  * Можно использовать списки.
+  * И **другую** разметку.
+
+- Название таба 2
+
+  Текст таба 2.
+
+{% endlist %}
+
+[*term1]: Some description

package/mocks/regression/input/includes/styles.md

@@ -0,0 +1,8 @@
+<style>
+
+.yfm .border-yes {
+    border: 1px solid #ccc;
+    border-radius: 10px;
+}
+
+</style>

package/mocks/regression/input/includes.md

@@ -15,10 +15,16 @@ Text
 
 [[?](*term)](http://ya.ru)
 
+[Term 1](*term1) [Term 2](*term2)
 
 Link after include
 [{#T}](./1.md#subtitle)
 
+Autotitle include
+<!-- [{#T}](includes/fragments.md#f3) -->
+
 Link after include
 
 [*term]: Test terms
+[*term1]: {% include [test](includes/fragments.md#f3) %}
+[*term2]: {% include [test](includes/fragments.md#f3) %}

package/mocks/regression/input/toc.yaml

@@ -11,6 +11,8 @@ items:
     href:
   - name: Multitoc item
     href: ./merge/merged.md
+  - name: Fragments
+    href: ./includes/fragments.md
   - include: {path: toc-i.yaml}
   - include: {path: sub/toc.yaml, mode: link}
   - href: ./mermaid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/cli-tests",
-  "version": "5.35.3",
+  "version": "5.36.1",
   "bin": {
     "diplodoc-cli-test": "bin.mjs"
   },