@diplodoc/cli 4.19.1 → 4.19.3

package/package.json

@@ -3,7 +3,7 @@
   "author": "Yandex Data UI Team <data-ui@yandex-team.ru>",
   "description": "Make documentation using yfm-docs in Markdown and HTML formats",
   "license": "MIT",
-  "version": "4.19.1",
+  "version": "4.19.3",
   "repository": {
     "type": "git",
     "url": "git@github.com:diplodoc-platform/cli.git"
@@ -55,12 +55,12 @@
     "@types/chalk": "2.2.0",
     "@types/glob": "^8.1.0",
     "@types/html-escaper": "^3.0.0",
-    "@types/js-yaml": "4.0.5",
+    "@types/js-yaml": "4.0.9",
     "@types/json-stringify-safe": "^5.0.3",
     "@types/lodash": "4.14.195",
-    "@types/mime-types": "2.1.1",
+    "@types/mime-types": "2.1.4",
     "@types/node": "14.*",
-    "@types/shelljs": "0.8.12",
+    "@types/shelljs": "0.8.15",
     "@types/tar-stream": "^2.2.2",
     "@types/yargs": "17.0.24",
     "ajv": "^8.11.0",

package/src/steps/processAssets.ts

@@ -2,9 +2,9 @@ import walkSync from 'walk-sync';
 import {load} from 'js-yaml';
 import {readFileSync} from 'fs';
 import shell from 'shelljs';
-import {join, resolve} from 'path';
+import {join, resolve, sep} from 'path';
 
-import {ArgvService} from '../services';
+import {ArgvService, TocService} from '../services';
 import {checkPathExists, copyFiles, findAllValuesByKeys} from '../utils';
 
 import {LINK_KEYS} from '@diplodoc/client/ssr';
@@ -18,6 +18,7 @@ import {
     YFM_CONFIG_FILENAME,
 } from '../constants';
 import {Resources} from '../models';
+import {resolveRelativePath} from '@diplodoc/transform/lib/utilsFS';
 
 /**
  * Processes assets files (everything except .md files)
@@ -60,7 +61,7 @@ function processAssetsHtmlRun({outputBundlePath}) {
 }
 
 function processAssetsMdRun({args, tmpOutputFolder}) {
-    const {allowCustomResources, resources} = ArgvService.getConfig();
+    const {input: inputFolderPath, allowCustomResources, resources} = ArgvService.getConfig();
 
     const pathToConfig = args.config || join(args.input, YFM_CONFIG_FILENAME);
     const pathToRedirects = join(args.input, REDIRECTS_FILENAME);
@@ -82,14 +83,16 @@ function processAssetsMdRun({args, tmpOutputFolder}) {
         copyFiles(args.input, tmpOutputFolder, resourcePaths);
     }
 
-    const yamlFiles: string[] = walkSync(args.input, {
-        globs: ['**/*.yaml'],
-        directories: false,
-        includeBasePath: true,
-        ignore: ['**/toc.yaml', resolve(pathToRedirects)],
-    });
+    const tocYamlFiles = TocService.getNavigationPaths().reduce((acc, file) => {
+        if (file.endsWith('.yaml')) {
+            const resolvedPathToFile = resolve(inputFolderPath, file);
 
-    yamlFiles.forEach((yamlFile) => {
+            acc.push(resolvedPathToFile);
+        }
+        return acc;
+    }, []);
+
+    tocYamlFiles.forEach((yamlFile) => {
         const content = load(readFileSync(yamlFile, 'utf8'));
 
         if (!Object.prototype.hasOwnProperty.call(content, 'blocks')) {
@@ -97,17 +100,25 @@ function processAssetsMdRun({args, tmpOutputFolder}) {
         }
 
         const contentLinks = findAllValuesByKeys(content, LINK_KEYS);
-        const localMediaLinks = contentLinks.filter(
-            (link) =>
-                new RegExp(/^\S.*\.(svg|png|gif|jpg|jpeg|bmp|webp|ico)$/gm).test(link) &&
-                isLocalUrl(link),
+        const localMediaLinks = contentLinks.reduce(
+            (acc, link) => {
+                const linkHasMediaExt = new RegExp(
+                    /^\S.*\.(svg|png|gif|jpg|jpeg|bmp|webp|ico)$/gm,
+                ).test(link);
+
+                if (linkHasMediaExt && isLocalUrl(link) && checkPathExists(link, yamlFile)) {
+                    const linkAbsolutePath = resolveRelativePath(yamlFile, link);
+                    const linkRootPath = linkAbsolutePath.replace(`${inputFolderPath}${sep}`, '');
+
+                    acc.push(linkRootPath);
+                }
+                return acc;
+            },
+
+            [],
         );
 
-        copyFiles(
-            args.input,
-            tmpOutputFolder,
-            localMediaLinks.filter((link) => checkPathExists(link, yamlFile)),
-        );
+        copyFiles(args.input, tmpOutputFolder, localMediaLinks);
     });
 }