npm - @diplodoc/cli-tests - Versions diffs - 5.28.0 → 5.30.0 - Mend

@diplodoc/cli-tests 5.28.0 → 5.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/e2e/__snapshots__/skip-html-extension.spec.ts.snap CHANGED Viewed

@@ -143,7 +143,7 @@ exports[`Skip html extension > correctly trims .html and index.html on monolingu
     <body class="g-root g-root_theme_light">
         <div id="root"></div>
         <script type="application/json" id="diplodoc-state">
-            {"data":{"leading":false,"html":"&lt;h2 id=\\"hash\\"&gt;&lt;a href=\\"page2#hash\\" class=\\"yfm-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;hash&lt;/span&gt;&lt;/a&gt;hash&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"folder/\\"&gt;Link&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;External link&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"vcsPath":"page2.md"},"headings":[{"title":"hash","href":"page2#hash","level":2}],"title":"Page 2"},"router":{"pathname":"page2","depth":1,"base":"./"},"lang":"ru","langs":["ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
+            {"data":{"leading":false,"html":"&lt;h2 id=\\"hash\\"&gt;&lt;a href=\\"page2#hash\\" class=\\"yfm-anchor yfm-clipboard-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;hash&lt;/span&gt;&lt;/a&gt;hash&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"folder/\\"&gt;Link&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;External link&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"vcsPath":"page2.md"},"headings":[{"title":"hash","href":"page2#hash","level":2}],"title":"Page 2"},"router":{"pathname":"page2","depth":1,"base":"./"},"lang":"ru","langs":["ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
         </script>
         <script type="application/javascript">
             const data = document.querySelector('script#diplodoc-state');
@@ -325,7 +325,7 @@ exports[`Skip html extension > correctly trims .html and index.html on multiling
     <body class="g-root g-root_theme_light">
         <div id="root"></div>
         <script type="application/json" id="diplodoc-state">
-            {"data":{"leading":false,"html":"&lt;h2 id=\\"hash\\"&gt;&lt;a href=\\"en/page2#hash\\" class=\\"yfm-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;hash&lt;/span&gt;&lt;/a&gt;hash&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"en/folder/\\"&gt;Link&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;External link&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"alternate":[{"href":"en/page2","hreflang":"en"},{"href":"ru/page2","hreflang":"ru"}],"canonical":"en/page2","vcsPath":"en/page2.md"},"headings":[{"title":"hash","href":"en/page2#hash","level":2}],"title":"Page 2"},"router":{"pathname":"en/page2","depth":2,"base":"../"},"lang":"en","langs":["en","ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
+            {"data":{"leading":false,"html":"&lt;h2 id=\\"hash\\"&gt;&lt;a href=\\"en/page2#hash\\" class=\\"yfm-anchor yfm-clipboard-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;hash&lt;/span&gt;&lt;/a&gt;hash&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"en/folder/\\"&gt;Link&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;External link&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"alternate":[{"href":"en/page2","hreflang":"en"},{"href":"ru/page2","hreflang":"ru"}],"canonical":"en/page2","vcsPath":"en/page2.md"},"headings":[{"title":"hash","href":"en/page2#hash","level":2}],"title":"Page 2"},"router":{"pathname":"en/page2","depth":2,"base":"../"},"lang":"en","langs":["en","ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
         </script>
         <script type="application/javascript">
             const data = document.querySelector('script#diplodoc-state');
@@ -502,7 +502,7 @@ exports[`Skip html extension > correctly trims .html and index.html on multiling
     <body class="g-root g-root_theme_light">
         <div id="root"></div>
         <script type="application/json" id="diplodoc-state">
-            {"data":{"leading":false,"html":"&lt;h2 id=\\"hesh\\"&gt;&lt;a href=\\"ru/page2#hesh\\" class=\\"yfm-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;хэш&lt;/span&gt;&lt;/a&gt;хэш&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"ru/folder/\\"&gt;Ссылка&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;Внешняя ссылка&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"alternate":[{"href":"en/page2","hreflang":"en"},{"href":"ru/page2","hreflang":"ru"}],"canonical":"ru/page2","vcsPath":"ru/page2.md"},"headings":[{"title":"хэш","href":"ru/page2#hesh","level":2}],"title":"Страница 2"},"router":{"pathname":"ru/page2","depth":2,"base":"../"},"lang":"ru","langs":["en","ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
+            {"data":{"leading":false,"html":"&lt;h2 id=\\"hesh\\"&gt;&lt;a href=\\"ru/page2#hesh\\" class=\\"yfm-anchor yfm-clipboard-anchor\\" aria-hidden=\\"true\\"&gt;&lt;span class=\\"visually-hidden\\" data-no-index=\\"true\\"&gt;хэш&lt;/span&gt;&lt;/a&gt;хэш&lt;/h2&gt;/n&lt;p&gt;&lt;a href=\\"ru/folder/\\"&gt;Ссылка&lt;/a&gt;&lt;br /&gt;/n&lt;a href=\\"https://example.com\\" target=\\"_blank\\" rel=\\"noreferrer noopener\\"&gt;Внешняя ссылка&lt;/a&gt;&lt;/p&gt;/n","meta":{"metadata":[{"name":"generator","content":"Diplodoc Platform vDIPLODOC-VERSION"}],"alternate":[{"href":"en/page2","hreflang":"en"},{"href":"ru/page2","hreflang":"ru"}],"canonical":"ru/page2","vcsPath":"ru/page2.md"},"headings":[{"title":"хэш","href":"ru/page2#hesh","level":2}],"title":"Страница 2"},"router":{"pathname":"ru/page2","depth":2,"base":"../"},"lang":"ru","langs":["en","ru"],"viewerInterface":{"toc":true,"search":true,"feedback":true}}
         </script>
         <script type="application/javascript">
             const data = document.querySelector('script#diplodoc-state');

package/e2e/disable-csp.spec.ts ADDED Viewed

@@ -0,0 +1,55 @@
+import {readFileSync, readdirSync} from 'node:fs';
+import {join, sep} from 'node:path';
+import {describe, expect, test} from 'vitest';
+import {TestAdapter, getTestPaths} from '../fixtures';
+function findHtmlFiles(dir: string): string[] {
+    const results: string[] = [];
+    try {
+        for (const entry of readdirSync(dir, {withFileTypes: true})) {
+            const full = join(dir, entry.name);
+            if (entry.isDirectory()) {
+                results.push(...findHtmlFiles(full));
+            } else if (entry.name.endsWith('.html')) {
+                results.push(full);
+            }
+        }
+    } catch {
+        // ignore
+    }
+    return results;
+}
+describe('disableCsp', () => {
+    test('should not inject CSP meta tag when disableCsp is true with neuroExpert enabled', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/disable-csp');
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+            args: '-j2',
+        });
+        const htmlFiles = findHtmlFiles(outputPath);
+        expect(htmlFiles.length).toBeGreaterThan(0);
+        // No HTML page should contain CSP meta tag
+        for (const htmlFile of htmlFiles) {
+            const html = readFileSync(htmlFile, 'utf8');
+            expect(html).not.toContain('Content-Security-Policy');
+        }
+        // Content pages (under en/) should still have the neuroExpert widget script
+        const contentPages = htmlFiles.filter((f) => f.includes(`${sep}en${sep}`));
+        expect(contentPages.length).toBeGreaterThan(0);
+        for (const htmlFile of contentPages) {
+            const html = readFileSync(htmlFile, 'utf8');
+            expect(html).toContain('neuroexpert-widget');
+        }
+    });
+});

package/e2e/include-toc.test.ts CHANGED Viewed

@@ -52,4 +52,16 @@ describe('Include toc', () => {
         await TestAdapter.testBuildPass(inputPath, outputPath);
         await compareDirectories(outputPath);
     });
+    test('Toc with generic includer and linkIndex option', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/include-toc/test8');
+        await TestAdapter.testBuildPass(inputPath, outputPath);
+        await compareDirectories(outputPath);
+    });
+    test('Toc with generic includer keeps index.md as child item by default', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/include-toc/test9');
+        await TestAdapter.testBuildPass(inputPath, outputPath);
+        await compareDirectories(outputPath);
+    });
 });

package/mocks/disable-csp/input/.yfm ADDED Viewed

@@ -0,0 +1,8 @@
+allowHtml: true
+langs: ['en']
+disableCsp: true
+neuroExpert:
+  projectId:
+    default: test-project-id

package/mocks/disable-csp/input/en/index.md ADDED Viewed

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

package/mocks/disable-csp/input/en/page.md ADDED Viewed

@@ -0,0 +1,3 @@
+# Page
+Some content

package/mocks/disable-csp/input/en/toc.yaml ADDED Viewed

@@ -0,0 +1,5 @@
+title: DisableCSP
+href: index.md
+items:
+  - name: Page
+    href: page.md

package/mocks/include-toc/test8/input/test/index.md ADDED Viewed

@@ -0,0 +1,4 @@
+# H1
+[same level link](./test.md)
+[inner link](./sub/sub-1.md)

package/mocks/include-toc/test8/input/test/sub/index.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # Sub index

package/mocks/include-toc/test8/input/test/sub/sub/sub-3.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test8/input/test/sub/sub-1.md ADDED Viewed

@@ -0,0 +1,5 @@
+# H1
+[same level link](./sub-2.md)
+[outer link](../test.md)
+[inner link](./sub/sub-3.md)

package/mocks/include-toc/test8/input/test/sub/sub-2.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test8/input/test/test.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test8/input/toc.yaml ADDED Viewed

@@ -0,0 +1,9 @@
+title: main
+items:
+  - include:
+      path: test
+      includers:
+        - name: generic
+          autotitle: false
+          input: test
+          linkIndex: true

package/mocks/include-toc/test9/input/test/index.md ADDED Viewed

@@ -0,0 +1,4 @@
+# H1
+[same level link](./test.md)
+[inner link](./sub/sub-1.md)

package/mocks/include-toc/test9/input/test/sub/index.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # Sub index

package/mocks/include-toc/test9/input/test/sub/sub/sub-3.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test9/input/test/sub/sub-1.md ADDED Viewed

@@ -0,0 +1,5 @@
+# H1
+[same level link](./sub-2.md)
+[outer link](../test.md)
+[inner link](./sub/sub-3.md)

package/mocks/include-toc/test9/input/test/sub/sub-2.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test9/input/test/test.md ADDED Viewed

	@@ -0,0 +1 @@
1	+ # H1

package/mocks/include-toc/test9/input/toc.yaml ADDED Viewed

@@ -0,0 +1,8 @@
+title: main
+items:
+  - include:
+      path: test
+      includers:
+        - name: generic
+          autotitle: false
+          input: test

package/mocks/pdf-page/title-pages/input/pdf-endings/pdf-ending-page1.md ADDED Viewed

@@ -0,0 +1,13 @@
+### Pdf ending page 1
+Should be able to use variables {{test}}
+Should be able to use link to other pages [test](../page1.md)
+Should be able to use inlcudes
+{% include [test-include](../__includes/include1.md) %}
+Should be able to resolve liquid syntax
+{% if test == "pdf" %} should be visible {% endif %}

package/mocks/pdf-page/title-pages/input/pdf-endings/pdf-ending-page2.md ADDED Viewed

@@ -0,0 +1,3 @@
+<div class="pdf-title-page-wrapper">
+    <p>Lorem ipsum ending page with var {{test}}</p>
+</div>

package/mocks/pdf-page/title-pages/input/toc.yaml CHANGED Viewed

@@ -4,6 +4,9 @@ pdf:
   startPages:
     - ./pdf-titles/pdf-title-page1.md
     - ./pdf-titles/pdf-title-page2.md
+  endPages:
+    - ./pdf-endings/pdf-ending-page1.md
+    - ./pdf-endings/pdf-ending-page2.md
 items:
   - name: Title 1

package/package.json CHANGED Viewed

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