@diplodoc/cli-tests 5.8.2 → 5.8.3

package/e2e/__snapshots__/preprocess.test.ts.snap

@@ -5,12 +5,15 @@ exports[`Preprocess > HashIncludes=true,Autotitles=false > filelist 1`] = `
   ".yfm",
   "1.md",
   "_assets/1.png",
+  "_assets/1.svg",
   "autotitle.md",
   "images.md",
   "included-item.md",
   "includes.md",
   "includes/deep-hash.md",
+  "includes/deepWithIndent-hash.md",
   "includes/sub/user-hash.md",
+  "includes/sub/userWithIndent-hash.md",
   "includes/test-hash.md",
   "includes/user-hash.md",
   "latex.md",
@@ -21,8 +24,7 @@ exports[`Preprocess > HashIncludes=true,Autotitles=false > filelist 1`] = `
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=false 1`] = `
-"preprocess:
-  mergeAutotitles: false
+"allowHtml: true
 "
 `;
 
@@ -52,13 +54,13 @@ default-var-value
 
 ## Subtitle {#subtitle}
 
-[{#T}](./mermaid.md)
+[{#T}](mermaid.md)
 
-[{#T}](./mermaid.md#info)
+[{#T}](mermaid.md#info)
 
-[](./latex.md)
+[](latex.md)
 
-[noext-link](./includes)
+[noext-link](includes)
 
 {% include [user](includes/user-hash.md) %}
 "
@@ -70,7 +72,7 @@ metadata:
   - name: generator
     content: Diplodoc Platform vDIPLODOC-VERSION
 ---
-# Autotitles
+# Autotitles ![](_assets/1.svg)
 
 Empty title
 [](./1.md)
@@ -149,32 +151,54 @@ Link after include
 <!--{% include [For includes/deep.md](includes/deep.md) %}-->
 {% include [For includes/deep-hash.md](includes/deep-hash.md) %}
 
+Include with big indent
+
+{% include [For includes/deep.md](includes/deepWithIndent-hash.md) %}
+
 Link after include
 [{#T}](./1.md#subtitle)
 "
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=false 7`] = `
-"{% include [user](./sub/user-hash.md) %}
+"{% include [user](sub/user-hash.md) %}
 "
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=false 8`] = `
-"Bob
+"- list item
+
+  {% include [user](sub/userWithIndent-hash.md) %}
+
+Link to mermaid diagram from 1 level
+[](../mermaid.md)
 "
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=false 9`] = `
-"Test
+"Bob
 "
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=false 10`] = `
+"Link to mermaid diagram from 2 level
+[](../../mermaid.md)
+
+- User
+  Bob"
+`;
+
+exports[`Preprocess > HashIncludes=true,Autotitles=false 11`] = `
+"Test
+"
+`;
+
+exports[`Preprocess > HashIncludes=true,Autotitles=false 12`] = `
 "Bob
 "
 `;
 
-exports[`Preprocess > HashIncludes=true,Autotitles=false 11`] = `
+exports[`Preprocess > HashIncludes=true,Autotitles=false 13`] = `
 "---
 metadata:
   - name: generator
@@ -186,7 +210,7 @@ $/sqrt{3x-1}+(1+x)^2$
 "
 `;
 
-exports[`Preprocess > HashIncludes=true,Autotitles=false 12`] = `
+exports[`Preprocess > HashIncludes=true,Autotitles=false 14`] = `
 "---
 metadata:
   - name: generator
@@ -208,7 +232,7 @@ Some mermaid info
 "
 `;
 
-exports[`Preprocess > HashIncludes=true,Autotitles=false 13`] = `
+exports[`Preprocess > HashIncludes=true,Autotitles=false 15`] = `
 "---
 metadata:
   - name: generator
@@ -219,10 +243,12 @@ metadata:
 Item 1 text
 
 [{#T}](../../images.md)
+
+[{#T}](../../autotitle.md)
 "
 `;
 
-exports[`Preprocess > HashIncludes=true,Autotitles=false 14`] = `
+exports[`Preprocess > HashIncludes=true,Autotitles=false 16`] = `
 "items:
   - name: Md item with not_var syntax
     href: 1.md
@@ -253,6 +279,7 @@ exports[`Preprocess > HashIncludes=true,Autotitles=true > filelist 1`] = `
   ".yfm",
   "1.md",
   "_assets/1.png",
+  "_assets/1.svg",
   "autotitle.md",
   "images.md",
   "included-item.md",
@@ -271,8 +298,7 @@ exports[`Preprocess > HashIncludes=true,Autotitles=true > filelist 1`] = `
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=true 1`] = `
-"preprocess:
-  mergeAutotitles: true
+"allowHtml: true
 "
 `;
 
@@ -302,13 +328,13 @@ default-var-value
 
 ## Subtitle {#subtitle}
 
-[Mermaid usage](./mermaid.md)
+[Mermaid usage](mermaid.md)
 
-[Mermaid info](./mermaid.md#info)
+[Mermaid info](mermaid.md#info)
 
-[Latex usage](./latex.md)
+[Latex usage](latex.md)
 
-[noext-link](./includes)
+[noext-link](includes)
 
 {% include [user](includes/user-hash.md) %}
 "
@@ -320,7 +346,7 @@ metadata:
   - name: generator
     content: Diplodoc Platform vDIPLODOC-VERSION
 ---
-# Autotitles
+# Autotitles ![](_assets/1.svg)
 
 Empty title
 [Title](./1.md)
@@ -409,17 +435,18 @@ Link after include
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=true 7`] = `
-"{% include [user](./sub/user-hash.md) %}
+"{% include [user](sub/user-hash.md) %}
 "
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=true 8`] = `
 "- list item
 
-  {% include [user](./sub/userWithIndent-hash.md) %}
+  {% include [user](sub/userWithIndent-hash.md) %}
 
 Link to mermaid diagram from 1 level
-[Mermaid usage](../mermaid.md)"
+[Mermaid usage](../mermaid.md)
+"
 `;
 
 exports[`Preprocess > HashIncludes=true,Autotitles=true 9`] = `
@@ -490,6 +517,8 @@ metadata:
 Item 1 text
 
 [Images](../../images.md)
+
+[Autotitles ![../../_assets/1.svg](../../autotitle.md)
 "
 `;
 

package/e2e/preprocess.test.ts

@@ -3,19 +3,31 @@ import {TestAdapter, compareDirectories, getTestPaths} from '../fixtures';
 
 const generateFilesYamlTestTemplate = (
     testTitle: string,
-    testRootPath: string
+    testRootPath: string,
+    args: string[] = [],
 ) => {
     test(testTitle, async () => {
         const {inputPath, outputPath} = getTestPaths(testRootPath);
-        await TestAdapter.testBuildPass(inputPath, outputPath, {md2md:true});
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md:true,
+            md2html: false,
+            args: args.join(' '),
+        });
+        await TestAdapter.testBuildPass(outputPath, outputPath + '-html', {
+            md2md: false,
+            md2html: true,
+            args: args.join(' '),
+        });
         await compareDirectories(outputPath);
     });
 };
 
 describe('Preprocess', () => {
-    generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=false', 'mocks/preprocess/test1');
+    generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=false', 'mocks/preprocess', [
+        '--no-merge-autotitles'
+    ]);
 
-    generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=true', 'mocks/preprocess/test2');
+    generateFilesYamlTestTemplate('HashIncludes=true,Autotitles=true', 'mocks/preprocess');
 
     // generateFilesYamlTestTemplate('Nested toc restricted access', 'mocks/preprocess/test3');
 });

package/mocks/preprocess/input/.yfm

@@ -0,0 +1 @@
+allowHtml: true

package/mocks/preprocess/{test1/input → input}/1.md

@@ -18,12 +18,12 @@ not_var{{skip()}}
 
 ## Subtitle {#subtitle}
 
-[{#T}](./mermaid.md)
+[{#T}](mermaid.md)
 
-[{#T}](./mermaid.md#info)
+[{#T}](mermaid.md#info)
 
-[](./latex.md)
+[](latex.md)
 
-[noext-link](./includes)
+[noext-link](includes)
 
 {% include [user](includes/user.md) %}

package/mocks/preprocess/{test2/input → input}/autotitle.md

@@ -1,4 +1,4 @@
-# Autotitles
+# Autotitles ![](_assets/1.svg)
 
 Empty title
 [](./1.md)

package/mocks/preprocess/input/includes/deep.md

@@ -0,0 +1 @@
+{% include [user](sub/user.md) %}

package/mocks/preprocess/input/includes/deepWithIndent.md

@@ -0,0 +1,6 @@
+- list item
+
+  {% include [user](sub/userWithIndent.md) %}
+
+Link to mermaid diagram from 1 level
+[](../mermaid.md)

package/mocks/preprocess/{test2/input → input}/sub/folder/item-1.md

@@ -3,3 +3,5 @@
 Item 1 text
 
 [{#T}](../../images.md)
+
+[{#T}](../../autotitle.md)

package/package.json

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

package/mocks/preprocess/test1/input/.yfm

@@ -1,2 +0,0 @@
-preprocess:
-  mergeAutotitles: false

package/mocks/preprocess/test1/input/autotitle.md

@@ -1,23 +0,0 @@
-# Autotitles
-
-Empty title
-[](./1.md)
-
-Empty subtitle
-[](./1.md#subtitle)
-
-Special title
-[{#T}](./1.md)
-
-Special subtitle
-[{#T}](./1.md#subtitle)
-
-Empty local title
-[](#header)
-
-Special local title
-[{#T}](#header)
-
-## Header {#header}
-
-Content

package/mocks/preprocess/test1/input/includes/deep.md

@@ -1 +0,0 @@
-{% include [user](./sub/user.md) %}

package/mocks/preprocess/test1/input/includes.md

@@ -1,14 +0,0 @@
-Text
-
-{% include [user](includes/user.md) %}
-
-{% include [test](includes/test.md) %}
-
-Link after include
-[{#T}](./1.md)
-
-<!--{% include [For includes/deep.md](includes/deep.md) %}-->
-{% include [For includes/deep.md](includes/deep.md) %}
-
-Link after include
-[{#T}](./1.md#subtitle)

package/mocks/preprocess/test1/input/sub/folder/item-1.md

@@ -1,5 +0,0 @@
-# Item 1
-
-Item 1 text
-
-[{#T}](../../images.md)

package/mocks/preprocess/test2/input/.yfm

@@ -1,2 +0,0 @@
-preprocess:
-  mergeAutotitles: true

package/mocks/preprocess/test2/input/1.md

@@ -1,29 +0,0 @@
-# Title
-
-Text not_var{{not-var}} not_var{{skip()}} {{default-var}}
-
-Text `not_var{{not-var}}` `not_var{{skip()}}` `{{default-var}}`
-
-Text
-```
-not_var{{not-var}}
-
-not_var{{skip()}}
-
-{{default-var}}
-```
-
-
-`[not a link](./path/to/relative/file.md)`
-
-## Subtitle {#subtitle}
-
-[{#T}](./mermaid.md)
-
-[{#T}](./mermaid.md#info)
-
-[](./latex.md)
-
-[noext-link](./includes)
-
-{% include [user](includes/user.md) %}

package/mocks/preprocess/test2/input/commented-include.md

@@ -1,3 +0,0 @@
-![](./missed-asset.png)
-
-[](./missed-link.md)

package/mocks/preprocess/test2/input/images.md

@@ -1,5 +0,0 @@
-# Images
-
-![simple image](_assets/1.png)
-
-

package/mocks/preprocess/test2/input/included-item.md

@@ -1,12 +0,0 @@
-# Included item
-
-Included item text
-
-<!-- :   {% include [rec-off](./commented-include.md) %} -->
-
-{% note alert "Alert!" %}
-
-  <!-- content -->
-
-{% endnote %}
-

package/mocks/preprocess/test2/input/includes/deep.md

@@ -1 +0,0 @@
-{% include [user](./sub/user.md) %}

package/mocks/preprocess/test2/input/includes/deepWithIndent.md

@@ -1,6 +0,0 @@
-- list item
-
-  {% include [user](./sub/userWithIndent.md) %}
-
-Link to mermaid diagram from 1 level
-[](../mermaid.md)

package/mocks/preprocess/test2/input/includes/presets.yaml

@@ -1,2 +0,0 @@
-default:
-  user: Alice

package/mocks/preprocess/test2/input/includes/sub/user.md

@@ -1 +0,0 @@
-{{user}}

package/mocks/preprocess/test2/input/includes/test.md

@@ -1 +0,0 @@
-Test

package/mocks/preprocess/test2/input/includes/user.md

@@ -1 +0,0 @@
-{{user}}

package/mocks/preprocess/test2/input/latex.md

@@ -1,3 +0,0 @@
-# Latex usage
-
-$\sqrt{3x-1}+(1+x)^2$

package/mocks/preprocess/test2/input/mermaid.md

@@ -1,13 +0,0 @@
-# Mermaid usage
-
-```mermaid
-
-  sequenceDiagram
-        rect rgba(251, 243, 232, 0.2)
-            Alice ->> Bob:
-        end
-  ```
-
-## Mermaid info {#info}
-
-Some mermaid info

package/mocks/preprocess/test2/input/presets.yaml

@@ -1,8 +0,0 @@
-default:
-  default-var: default-var-value
-  not-var: not-var-value
-  product: root
-  user: Bob
-
-internal:
-  default-var: default-var-internal-value

package/mocks/preprocess/test2/input/sub/toc.yaml

@@ -1,5 +0,0 @@
-items:
-  name: Named include (items is Object here - this is not an error)
-  items:
-    - name: Item 1
-      href: folder/item-1.md

package/mocks/preprocess/test2/input/toc-i.yaml

@@ -1,3 +0,0 @@
-items:
-  - name: Included Item
-    href: ./included-item.md

package/mocks/preprocess/test2/input/toc.yaml

@@ -1,16 +0,0 @@
-items:
-  - name: Md item with not_var syntax
-    href: ./1.md
-  - name: Md item named without extension
-    href: ./1
-  - include: {path: toc-i.yaml}
-  - include: {path: sub/toc.yaml, mode: link}
-  - href: ./mermaid
-  - name: '{#T}'
-    href: ./latex
-  - name: Images
-    href: ./images
-  - name: Autotitle
-    href: ./autotitle
-  - name: includes
-    href: ./includes