@diplodoc/cli-tests 0.0.0-rc-toc-translation-202506261401 → 0.0.0-rc-fix-translate-openapi-includer-202507171205

package/e2e/search.test.ts

@@ -0,0 +1,15 @@
+import {describe, it} from 'vitest';
+import {TestAdapter, compareDirectories, getTestPaths} from '../fixtures';
+
+describe('Local search', () => {
+    it('internal', async () => {
+        const {inputPath, outputPath} = getTestPaths('mocks/search');
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {
+            md2md: false,
+            md2html: true,
+            args: '-j2 --search',
+        });
+        await compareDirectories(outputPath);
+    });
+});

package/e2e/translation.spec.ts

@@ -5,13 +5,14 @@ const generateMapTestTemplate = (
     testTitle: string,
     testRootPath: string,
     args: TranslateRunArgs,
+    ignoreFileContent = true,
 ) => {
-    test(testTitle, async () => {
+    test.skip(testTitle, async () => {
         const {inputPath, outputPath} = getTestPaths(testRootPath);
 
         await TestAdapter.testTranslatePass(inputPath, outputPath, args);
 
-        await compareDirectories(outputPath);
+        await compareDirectories(outputPath, ignoreFileContent);
     });
 };
 
@@ -29,7 +30,32 @@ const generateFilesYamlTestTemplate = (
     });
 };
 
+const buildFilesYamlTestTemplate = (
+    testTitle: string,
+    testRootPath: string,
+    buildProps: {md2md?: boolean; md2html?: boolean},
+) => {
+    test(testTitle, async () => {
+        const {inputPath, outputPath} = getTestPaths(testRootPath);
+        const {md2md, md2html} =buildProps;
+
+        await TestAdapter.testBuildPass(inputPath, outputPath, {md2html, md2md});
+
+        await compareDirectories(outputPath);
+    });
+};
+
 describe('Translate command', () => {
+    buildFilesYamlTestTemplate('build translated md files and remove no-translate directives', 'mocks/translation/no-translate', {md2md: true});
+
+    buildFilesYamlTestTemplate('build translated static files and remove no-translate directives', 'mocks/translation/no-translate', {md2html: true});
+
+    generateFilesYamlTestTemplate('extract openapi spec files', 'mocks/translation/openapi', {
+        subcommand: 'extract',
+        source: 'ru-RU',
+        target: 'es-ES',
+    });
+
     generateMapTestTemplate('filter files on extract', 'mocks/translation/dir-files', {
         subcommand: 'extract',
         source: 'ru-RU',
@@ -43,20 +69,19 @@ describe('Translate command', () => {
             subcommand: 'extract',
             source: 'ru-RU',
             target: 'es-ES',
-            additionalArgs: '--exclude ru/to-be-excluded.md',
+            additionalArgs: '--exclude ru/_no-translate/*.md',
         },
     );
 
-    const vars = {skip: 'prod'}
     generateMapTestTemplate(
-        'filter files on extract with extra vars option',
-        'mocks/translation/dir-files',
+        'test no-translate directive',
+        'mocks/translation/no-translate',
         {
             subcommand: 'extract',
             source: 'ru-RU',
-            target: 'es-ES',
-            additionalArgs: `--vars ${JSON.stringify(vars)}`,
+            target: 'es-ES',            
         },
+        false,
     );
 
     generateFilesYamlTestTemplate('extract yaml scheme files', 'mocks/translation/yaml-scheme', {

package/fixtures/utils/test.ts

@@ -11,6 +11,7 @@ export function platformless(text: string): string {
 export function hashless(text: string): string {
     return text
         .replace(/-[a-z0-9]{12}\./g, '-hash.')
+        .replace(/(\/|\\)[a-z0-9]{12,13}-(index|registry|resources)\./g, '/hash-$2.');
 }
 
 export function bundleless(text: string): string {

package/mocks/search/input/index.md

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

package/mocks/search/input/toc.yaml

@@ -0,0 +1 @@
+href: index.md

package/mocks/translation/dir-files/input/ru/aboba.md

@@ -1,5 +1,7 @@
 ## Заголовок include
 
-<!-- [ссылка на файл не в toc.yaml](./aboba-not-in-toc.md) -->
+[ссылка на файл не в toc.yaml](./aboba-not-in-toc.md)
+
+{% include [Описание](./_includes/test.md) %}
+
 
-{% include [Описание](./_includes/test.md) %}

package/mocks/translation/dir-files/input/ru/nested/toc.yaml

@@ -3,7 +3,6 @@ href: index.yaml
 items:
   - name: API Yandex Cloud
     href: index.yaml
-  - include: {mode: merge, path: folder1/toc-i.yaml}
   - name: Yandex Flavored Markdown
     href: index-yfm.md
     items:

package/mocks/translation/dir-files/input/ru/toc.yaml

@@ -4,10 +4,4 @@ items:
   - name: Aboba
     href: aboba.md
   - name: Не переводить
-    when: skip == 'prod'
-    href: _no-translate/exclude.md
-  - name: Нет переменной в vars
-    when: novar == 'test'
-    href: no-var-page.md
-  - name: exclude-test
-    href: to-be-excluded.md
+    href: _no-translate/exclude.md

package/mocks/translation/no-translate/input/index.md

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

package/mocks/translation/no-translate/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/no-translate/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/no-translate/input/toc.yaml

@@ -0,0 +1,11 @@
+title: Test123
+href: index.md
+items:
+  - name: Не переводить
+    href: no-translate.md
+  - name: openapi
+    include:
+      path: openapi
+      includers:
+        - name: openapi
+          input: openapi-spec.yaml

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

@@ -0,0 +1,42 @@
+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 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
+          description: |
+            Статус загрузки:
+            - `UPLOADED` — загрузка завершена.
+            - `IN_PROGRESS` — загрузка находится в процессе обработки.
+            - `PROCESSED` — загрузка успешно обработана.
+    #          $ref: '#/components/schemas/RecurceMiddle'
+    RecurceMiddle:
+      type: object
+      properties:
+        B:
+          type: array
+          items:
+            $ref: '#/components/schemas/RecurceTop'

package/mocks/translation/openapi/input/toc.yaml

@@ -0,0 +1,8 @@
+items:
+  - name: openapi
+    include:
+      path: openapi
+      includers:
+        - name: openapi
+          input: openapi-spec.yaml
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/cli-tests",
-  "version": "0.0.0-rc-toc-translation-202506261401",
+  "version": "0.0.0-rc-fix-translate-openapi-includer-202507171205",
   "bin": {
     "diplodoc-cli-test": "bin.mjs"
   },

package/mocks/translation/dir-files/input/.yfm

@@ -1,6 +0,0 @@
-translate:
-    extract:
-        vars:
-            test: prod
-            skip: dev
-            

package/mocks/translation/dir-files/input/ru/nested/a1.md

@@ -1,3 +0,0 @@
-## Included A1
-
-TEST

package/mocks/translation/dir-files/input/ru/nested/folder1/a1.md

@@ -1,3 +0,0 @@
-## Included A1
-
-TEST

package/mocks/translation/dir-files/input/ru/nested/folder1/toc-i.yaml

@@ -1,3 +0,0 @@
-items:
-  - name: A1
-    href: a1.md

package/mocks/translation/dir-files/input/ru/no-var-page.md

@@ -1,3 +0,0 @@
-## No var page
-
-This page might be translated or not. Depends on --strict-vars option.

package/mocks/translation/dir-files/input/ru/to-be-excluded.md

@@ -1 +0,0 @@
-## Excluded title