@diplodoc/cli-tests 5.39.7 → 5.40.0

package/e2e/merge-includes.spec.ts

@@ -91,6 +91,43 @@ describe('Merge includes (md2md)', () => {
         await compareDirectories(outputPath);
     });
 
+    test('yfm-table: include ending with HTML block places || on its own line', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/yfm-table-html-block');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('yfm-table: include with `|` in inline code falls back to {% included %}', async () => {
+        const {inputPath, outputPath} = getTestPaths(
+            'mocks/merge-includes/yfm-table-pipe-in-content',
+        );
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('indent-paragraph: include under indent with indented top-level paragraph falls back to {% included %}', async () => {
+        const {inputPath, outputPath} = getTestPaths(
+            'mocks/merge-includes/indent-paragraph-in-include',
+        );
+
+        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');
 
@@ -123,4 +160,37 @@ describe('Merge includes (md2md)', () => {
         });
         await compareDirectories(outputPath);
     });
+
+    test('html-comment-blanks: blank lines inside HTML comments keep list/cut continuity', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/html-comment-blanks');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('include-in-code-block: include shown as code example is NOT expanded', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/include-in-code-block');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
+
+    test('include-after-fence: include placed right after a closing ``` fence is inlined', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/merge-includes/include-after-fence');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: true,
+            md2html: false,
+            args: '--merge-includes',
+        });
+        await compareDirectories(outputPath);
+    });
 });

package/mocks/merge-includes/html-comment-blanks/input/_includes/examples.md

@@ -0,0 +1,27 @@
+- [Real link one](https://example.com/one)
+
+- [Real link two](https://example.com/two)
+
+<!--
+#|
+||
+**Header A**
+ |
+**Header B**
+||
+
+||
+Body cell A1
+
+with blank lines inside the comment
+
+|
+Body cell B1
+||
+
+||
+Body cell A2
+|
+Body cell B2
+||
+|# -->

package/mocks/merge-includes/html-comment-blanks/input/index.md

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

package/mocks/merge-includes/html-comment-blanks/input/main.md

@@ -0,0 +1,15 @@
+# Main
+
+Intro paragraph.
+
+- Item one with cut
+
+   {% cut "Examples" %}
+
+   {% include [examples](_includes/examples.md) %}
+
+   {% endcut %}
+
+- Item two
+
+After list paragraph that must still render.

package/mocks/merge-includes/html-comment-blanks/input/toc.yaml

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

package/mocks/merge-includes/include-after-fence/input/_includes/chat-button.md

@@ -0,0 +1 @@
+[Написать в чат](https://example.com/chat){.button}

package/mocks/merge-includes/include-after-fence/input/_includes/footer.md

@@ -0,0 +1 @@
+Footer text.

package/mocks/merge-includes/include-after-fence/input/index.md

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

package/mocks/merge-includes/include-after-fence/input/main.md

@@ -0,0 +1,14 @@
+# Main
+
+Some intro text.
+
+```javascript
+<script type="text/javascript">
+function setCookie(name, value){
+    document.cookie = name + "=" + value + ";path=/";
+}
+</script>
+```
+{% include [chat-button](_includes/chat-button.md) %}
+
+{% include [footer](_includes/footer.md) %}

package/mocks/merge-includes/include-after-fence/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Include After Fence
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/include-in-code-block/input/_includes/glossary.md

@@ -0,0 +1 @@
+[*glossary]: Glossary section

package/mocks/merge-includes/include-in-code-block/input/index.md

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

package/mocks/merge-includes/include-in-code-block/input/main.md

@@ -0,0 +1,19 @@
+# Main
+
+Real include below — should be inlined:
+
+{% include [glossary](_includes/glossary.md) %}
+
+Steps:
+
+1. Open the resource file.
+1. Insert the include directive into the file:
+
+    ```plaintext
+    {% include notitle [glossary](_includes/glossary.md) %}
+    [*glossary]: Magic line
+    ```
+
+1. Use the keys from glossary.
+
+End of page.

package/mocks/merge-includes/include-in-code-block/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Include In Code Block
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/indent-paragraph-in-include/input/_includes/requirements.md

@@ -0,0 +1,9 @@
+1\. Format: HTML5.
+
+2\. The banner stretches to fit the screen.
+
+3\. The banner must stretch to 100% of the screen width.
+
+  Width is set as a percentage value: 100%.
+
+4\. Maximum archive size is 75 KB.

package/mocks/merge-includes/indent-paragraph-in-include/input/index.md

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

package/mocks/merge-includes/indent-paragraph-in-include/input/main.md

@@ -0,0 +1,12 @@
+# Main Document
+
+{% list tabs %}
+
+- Mobile banner
+
+
+    {% include [requirements](_includes/requirements.md) %}
+
+    For more details see the requirements page.
+
+{% endlist %}

package/mocks/merge-includes/indent-paragraph-in-include/input/toc.yaml

@@ -0,0 +1,5 @@
+title: Merge Includes Indent Paragraph In Include
+href: index.md
+items:
+  - name: Main
+    href: main.md

package/mocks/merge-includes/yfm-table-html-block/input/_includes/button.md

@@ -0,0 +1,8 @@
+[Subscribe](https://example.com/subscribe){.button}
+
+<style>
+a.button {
+  color: black;
+  background: yellow;
+}
+</style>

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

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

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

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

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

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

package/mocks/merge-includes/yfm-table-pipe-in-content/input/_includes/example.md

@@ -0,0 +1 @@
+If you want to track clicking a particular button with the ID that contains `button` or `buy`, you can specify the following condition: `button|buy`.

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

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

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

@@ -0,0 +1,22 @@
+# Main Document
+
+#|
+||
+**Criterion**
+|
+**Description**
+||
+||
+**regular expression**
+|
+This is used for tracking goal identifiers that match a pattern.
+
+{% cut "Example" %}
+
+{% include [example](_includes/example.md) %}
+
+{% endcut %}
+||
+|#
+
+Content after table.

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

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

package/package.json

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