@diplodoc/cli-tests 5.22.4 → 5.22.5

package/e2e/__snapshots__/translation.spec.ts.snap

@@ -702,10 +702,6 @@ exports[`Translate command > do not filter files on extract > filelist 1`] = `
   "es/index.md.xliff",
   "es/nested/a1.md.skl",
   "es/nested/a1.md.xliff",
-  "es/nested/folder1/a1.md.skl",
-  "es/nested/folder1/a1.md.xliff",
-  "es/nested/folder1/toc-i.yaml.skl",
-  "es/nested/folder1/toc-i.yaml.xliff",
   "es/nested/index-yfm.md.skl",
   "es/nested/index-yfm.md.xliff",
   "es/nested/index.yaml.skl",
@@ -804,6 +800,23 @@ exports[`Translate command > do not resolve liquid conditions if vars not specif
 </xliff>"
 `;
 
+exports[`Translate command > do not translate merged entries with included toc > filelist 1`] = `
+"[
+  "included-toc.md.skl",
+  "included-toc.md.xliff",
+  "index.md.skl",
+  "index.md.xliff",
+  "merged-included-toc-item.md.skl",
+  "merged-included-toc-item.md.xliff",
+  "no-translate.md.skl",
+  "no-translate.md.xliff",
+  "openapi-spec.yaml.skl",
+  "openapi-spec.yaml.xliff",
+  "toc.yaml.skl",
+  "toc.yaml.xliff"
+]"
+`;
+
 exports[`Translate command > extract openapi spec files > filelist 1`] = `
 "[
   "openapi-spec.yaml.skl",

package/e2e/nested-include-links.spec.ts

@@ -0,0 +1,26 @@
+import {readFileSync} from 'node:fs';
+import {resolve} from 'node:path';
+import {describe, expect, test} from 'vitest';
+
+import {TestAdapter, getTestPaths} from '../fixtures';
+
+describe('Nested include links', () => {
+    test('Links in nested includes should resolve relative to the include file, not the entry file', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/nested-include-links');
+
+        // Build directly to HTML
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+        });
+
+        const htmlPath = resolve(outputPath, 'sub/deep/entry.html');
+        const html = readFileSync(htmlPath, 'utf8');
+
+        // The link from other/page.md is [link to target](../target.md)
+        // It should resolve relative to other/page.md → target.md → target.html
+        // NOT relative to the entry file sub/deep/entry.md → sub/deep/target.html
+        expect(html).toContain('target.html');
+        expect(html).not.toContain('sub/deep/target.html');
+    });
+});

package/e2e/translation.spec.ts

@@ -100,6 +100,16 @@ describe('Translate command', () => {
         target: 'es-ES',
     });
 
+    generateMapTestTemplate(
+        'do not translate merged entries with included toc',
+        'mocks/translation/toc-include',
+        {
+            subcommand: 'extract',
+            source: 'ru-RU',
+            target: 'es-ES',
+        },
+    );
+
     generateMapTestTemplate('do not filter files on extract', 'mocks/translation/dir-files', {
         subcommand: 'extract',
         source: 'ru-RU',

package/mocks/nested-include-links/input/includes/middle.md

@@ -0,0 +1,4 @@
+#### Section title {#section}
+
+{% include notitle [page](../other/page.md) %}
+

package/mocks/nested-include-links/input/other/page.md

@@ -0,0 +1,4 @@
+# Nested page
+
+[link to target](../target.md)
+

package/mocks/nested-include-links/input/sub/deep/entry.md

@@ -0,0 +1,8 @@
+- вы подключаете устройство, для которого не [popup](*popup);
+- другие способы настройки не сработали.
+
+
+
+[*popup]:
+    {% include notitle [section](../../includes/middle.md#section) %}
+

package/mocks/nested-include-links/input/target.md

@@ -0,0 +1,4 @@
+# Target page
+
+This is the target page that the link should point to.
+

package/mocks/nested-include-links/input/toc.yaml

@@ -0,0 +1,6 @@
+items:
+  - name: Target
+    href: target.md
+  - name: Entry
+    href: sub/deep/entry.md
+

package/mocks/translation/toc-include/input/included-toc/merged-included-toc-item.md

@@ -0,0 +1 @@
+#### Included toc item 

package/mocks/translation/toc-include/input/included-toc/toc.yaml

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

package/mocks/translation/toc-include/input/included-toc.md

@@ -0,0 +1 @@
+### Included toc

package/mocks/translation/toc-include/input/index.md

@@ -0,0 +1,7 @@
+## Index header
+
+::no-translate  [adsfasdfasdfasdfasdf]
+
+lorem
+
+asdfasdfasdf

package/mocks/translation/toc-include/input/merged-included-toc-item.md

@@ -0,0 +1 @@
+#### Included toc item 

package/mocks/translation/toc-include/input/no-translate.md

@@ -0,0 +1,57 @@
+# No-translate directive
+
+## Block directive
+:::no-translate
+### No-translate header
+
+:::html-block
+testsetsets
+:::
+
+::: any-other-directive
+content test
+:::
+
+Should not be translated.
+Can use **markup** inside.
+:::
+
+
+::: some-other-directive
+content here
+:::
+::: no-translate
+content here
+::: some-other-directive
+nested content
+:::
+:::
+
+## Leaf directive
+
+::no-translate [## /usr/local/bin/application]
+::no-translate[**C:\Program Files\Application\config.ini**]
+::no-translate [~/Documents/project/src/main.rs]
+
+
+- :no-translate[GET /api/v1/users] — get all users
+- :no-translate[POST /api/v1/auth/login] — authorization
+- :no-translate[PUT /api/v1/users/{id}] — update users data
+
+## Simple case leaf
+Install using command.
+:no-translate[The default port is unless specified.] Next sentence.
+Set NODE_ENV=production for production builds.
+
+## Simple case inline
+Install using :no-translate[npm install @company/package] command.
+The default port is :no-translate[8080] unless specified.
+Set :no-translate[NODE_ENV=production] for production builds.
+
+## Few inline directives
+Use :no-translate[**GET /api/v1/users**] to list users and :no-translate[POST /api/v1/users] to create.
+
+## Empty inline directive
+This is text with empty :no-translate[] directive.
+
+

package/mocks/translation/toc-include/input/openapi-spec.yaml

@@ -0,0 +1,37 @@
+openapi: 3.0.1
+info:
+  title: OpenAPI definition
+  version: v0
+servers:
+  - url: http://localhost:8080
+    description: Generated server url
+paths:
+  /test:
+    get:
+      tags:
+        - test-controller
+      summary: Simple get operation. тест новой верстки 3
+      description: Defines a simple get :no-translate[skip this] operation with no inputs and a complex
+      operationId: getWithPayloadResponse
+      responses:
+        "200":
+          description: 200!!!!
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RecurceTop'
+components:
+  schemas:
+    RecurceTop:
+      type: object
+      properties:
+        A:
+          type: string
+    #          $ref: '#/components/schemas/RecurceMiddle'
+    RecurceMiddle:
+      type: object
+      properties:
+        B:
+          type: array
+          items:
+            $ref: '#/components/schemas/RecurceTop'

package/mocks/translation/toc-include/input/toc.yaml

@@ -0,0 +1,14 @@
+title: Test123
+href: index.md
+items:
+  - name: Не переводить
+    href: no-translate.md
+  - name: openapi
+    include:
+      path: openapi
+      includers:
+        - name: openapi
+          input: openapi-spec.yaml
+  - name: Included TOC
+    href: included-toc.md
+    include: { mode: merge, path: included-toc/toc.yaml }

package/package.json

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

package/tsconfig.json

@@ -12,5 +12,5 @@
     "rootDir": "."
   },
   "include": ["fixtures/**/*", "**/*.test.ts", "**/*.spec.ts", "vitest.config.ts"],
-  "exclude": ["dist"]
+  "exclude": ["mocks/**/*"]
 }