@diplodoc/cli-tests 5.15.4 → 5.15.7

package/e2e/translation.spec.ts

@@ -9,13 +9,15 @@ const generateMapTestTemplate = (
     testRootPath: string,
     args: TranslateRunArgs,
     ignoreFileContent = true,
+    // TODO: added especialy for 'extract openapi spec files with custom openapi schema provided' test, arc test issue
+    ignoreFileList = false,
 ) => {
     test(testTitle, async () => {
         const {inputPath, outputPath} = getTestPaths(testRootPath);
 
         await TestAdapter.testTranslatePass(inputPath, outputPath, args);
 
-        await compareDirectories(outputPath, ignoreFileContent);
+        await compareDirectories(outputPath, ignoreFileContent, false, ignoreFileList);
     });
 };
 
@@ -67,9 +69,9 @@ describe('Translate command', () => {
         target: 'es-ES',
     });
 
-    generateFilesYamlTestTemplate(
+    generateMapTestTemplate(
         'extract openapi spec files with custom openapi schema provided',
-        'mocks/translation/custom-schema',
+        'mocks/translation/openapi',
         {
             subcommand: 'extract',
             source: 'ru-RU',
@@ -77,6 +79,8 @@ describe('Translate command', () => {
             additionalArgs:
                 '--schema mocks/translation/custom-schema/custom-openapi-schema-30.yaml',
         },
+        false,
+        true,
     );
 
     generateFilesYamlTestTemplate('compose openapi spec files', 'mocks/translation/compose', {

package/fixtures/utils/file.ts

@@ -57,6 +57,7 @@ export async function compareDirectories(
     outputPath: string,
     ignoreFileContent = false,
     checkBundle = false,
+    ignoreFileList = false,
 ) {
     const filesFromOutput = (
         await glob(`**/*`, {
@@ -84,7 +85,9 @@ export async function compareDirectories(
     // We sort only the final list and put it in the snapshot
     filesForSnapshot = filesForSnapshot.map(hashless).sort();
 
-    expect(JSON.stringify(filesForSnapshot, null, 2)).toMatchSnapshot('filelist');
+    if (!ignoreFileList) {
+        expect(JSON.stringify(filesForSnapshot, null, 2)).toMatchSnapshot('filelist');
+    }
 
     if (!ignoreFileContent) {
         filesFromOutput

package/mocks/alternates/input/.yfm

@@ -1 +1 @@
-langs: ['ru', 'en', 'az']
+langs: ['ru', 'en', {'lang': 'az', 'tld': 'az'}]

package/mocks/assets/input/index.md

@@ -1,6 +1,6 @@
 # Header
 
-![_images/versions.png]
+![](_images/versions.png)
 
 ::: page-constructor
 blocks:
@@ -11,9 +11,8 @@ blocks:
     controlPosition: 'content'
   - type: 'basic-card'
     title: 'Заголовок 2'
-    text: '![_images/camera.svg]'
+    text: '![](_images/versions.png)'
     border: 'shadow'
     controlPosition: 'content'
-    image:
-      icon: '_images/icons/bulb.svg'
+    icon: '_images/icons/bulb.svg'
 :::

package/mocks/assets/input/page.yaml

@@ -4,4 +4,4 @@ blocks:
     text: 'Текст'
     border: 'shadow'
     controlPosition: 'content'
-    image: '_images/mountain.jpg'
+    icon: '_images/mountain.jpg'

package/mocks/preprocess/input/_assets/2.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg width="20px" height="20px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" id="search" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="search_1_">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="57.9473" x2="407.9511" y1="351.4531" y2="149.3783">
+<stop offset="0" stop-color="#F14D5C"/>
+<stop offset="0.1309" stop-color="#F05454"/>
+<stop offset="0.3346" stop-color="#3bf488"/>
+<stop offset="0.3492"
+stop-color="#ED683C"/>
+<stop offset="0.714" stop-color="#1e15a3"/>
+<stop offset="1" stop-color="#FDC70C"/>
+</linearGradient>
+<path d="M300.766,87.509c-33.056,0-64.133,12.873-87.507,36.246c-23.374,23.374-36.247,54.451-36.247,87.507 
+c0,24.234,6.927,47.4,19.83,67.252l-12.669,12.669c0,0.001-0.001,0.001-0.001,0.001l-90.664,90.665   c-8.353,8.354-7.88,22.418,1.055,31.353l4.261,4.262c4.669,4.668,10.736,7.028,16.658,7.028c5.417,0,10.713-1.976,14.703-5.966   l15.405-15.405l75.259-75.259l12.671-12.672c19.85,12.9,43.014,19.826,67.246,19.826c33.056,0,64.133-12.873,87.506-36.247   c48.252-48.251,48.252-126.762,0-175.014C364.898,100.382,333.821,87.509,300.766,87.509z M138.518,396.049   c-4.454,4.453-12.178,3.979-17.219-1.063l-4.261-4.262c-5.036-5.035-5.509-12.756-1.055-17.21l71.38-71.38   c3.284,4.164,6.834,8.16,10.601,11.926c3.766,3.766,7.764,7.318,11.935,10.607L138.518,396.049z M105.894,410.391l-4.261-4.26   c-5.036-5.036-5.509-12.757-1.055-17.211l2.902-2.902c0.936,4.27,3.101,8.393,6.486,11.779l4.261,4.26   c3.392,3.393,7.523,5.549,11.799,6.483l-2.914,2.914C118.658,415.908,110.934,415.432,105.894,410.391z M213.788,320.779   c0.002-0.003,0.005-0.006,0.007-0.008l0,0L213.788,320.779z M217.033,317.534c-4.201-3.248-8.229-6.775-11.998-10.544   c-3.771-3.771-7.295-7.797-10.537-11.99l8.214-8.214c3.233,4.181,6.749,8.185,10.547,11.982c3.8,3.8,7.806,7.317,11.989,10.552   L217.033,317.534z M381.201,291.697c-21.485,21.485-50.052,33.318-80.436,33.318c-30.385,0-58.951-11.833-80.436-33.318   c-21.485-21.484-33.318-50.051-33.318-80.436s11.833-58.95,33.318-80.436c21.485-21.485,50.051-33.317,80.436-33.317   c30.384,0,58.95,11.832,80.436,33.317C425.553,175.179,425.553,247.346,381.201,291.697z" fill="url(#SVGID_1_)"/>
+<path d="M258.117,115.27l3.604,9.328c2.592-1.001,5.267-1.887,7.949-2.632l-2.676-9.636   C263.998,113.162,261.012,114.151,258.117,115.27z" fill="#3bf488ff"/>
+<path d="M206.264,162.886l8.985,4.389c8.299-16.992,22.191-30.997,39.118-39.433l-4.46-8.95   C231.022,128.304,215.523,143.928,206.264,162.886z" fill="#1e15a3ff"/>
+</g>
+</svg>

package/mocks/preprocess/input/images.md

@@ -64,6 +64,13 @@ Term
 15. `![code svg image 15][code]{inline=true}`
 ![svg image 15][code]{inline=true}
 
+16. `![svg with xml header](_assets/2.svg)`
+![svg with xml header](_assets/2.svg)
+
+17. Text link `backtick`.
+![Text link `backtick`](_assets/1.svg "Text link title `backtick`"){ width="100" }
+Text link `backtick`.
+
 20. Сodeblocks - no inline svg
 ```
 Codeblock fence
@@ -105,3 +112,50 @@ Codeblock with inline code
    `![code svg image 22](_assets/1.svg)`
 1. ![code svg image 23](_assets/1.svg)
 ```
+
+1. Codeblock in table with asset
+
+#|
+|| **col1** | **col2** | **col3** ||
+|| col1 | 
+```swift 
+some code ![svg image 24](_assets/1.svg =120x)
+``` | ![svg image 24](_assets/1.svg =120x) ||
+|#
+
+1. Codeblock in cat
+
+{% cut "first level" %}
+
+![svg image 25](_assets/1.svg)
+```md
+![code svg image 25](_assets/1.svg)
+```
+  {% cut "second level" %}
+
+  ![svg image 25](_assets/1.svg)
+
+  ```md
+  ![code svg image 26](_assets/1.svg)
+  ```
+
+  {% endcut %}
+
+{% endcut %}
+
+1. Codeblock in tabs
+
+{% list tabs %}
+- first
+
+  ![svg image 25](_assets/1.svg)
+  ```md
+  ![code svg image 25](_assets/1.svg)
+  ```
+- second
+
+  ![svg image 25](_assets/1.svg)
+  ```md
+  ![code svg image 25](_assets/1.svg)
+  ```
+{% endlist %}

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@diplodoc/cli-tests",
-  "version": "5.15.4",
+  "version": "5.15.7",
   "bin": {
     "diplodoc-cli-test": "bin.mjs"
   },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:diplodoc-platform/cli.git"
+  },
   "exports": {
     "./fixtures": "./fixtures/index.ts"
   },

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

@@ -1,42 +0,0 @@
-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/custom-schema/input/toc.yaml

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