@diplodoc/cli 4.19.1 → 4.19.3

package/build/index.js

@@ -8711,11 +8711,11 @@ var require_utilsFS = __commonJS2({
       }
     }
     exports2.isFileExists = isFileExists2;
-    function resolveRelativePath3(fromPath, relativePath) {
+    function resolveRelativePath4(fromPath, relativePath) {
       const { dir: fromDir } = (0, path_1.parse)(fromPath);
       return (0, path_1.resolve)(fromDir, relativePath);
     }
-    exports2.resolveRelativePath = resolveRelativePath3;
+    exports2.resolveRelativePath = resolveRelativePath4;
     function getFileTokens(path2, state, options) {
       const { getVarsPerFile: getVarsPerFile2, vars, disableLiquid, disableLint, lintMarkdown, disableTitleRefSubstitution, disableCircularError, inheritVars = true, conditionsInCode } = options;
       let content;
@@ -8757,7 +8757,7 @@ var require_utilsFS = __commonJS2({
       if (includePath.startsWith(path_1.sep)) {
         fullIncludePath = (0, path_1.join)(root, includePath);
       } else {
-        fullIncludePath = resolveRelativePath3(path2, includePath);
+        fullIncludePath = resolveRelativePath4(path2, includePath);
       }
       return fullIncludePath;
     };
@@ -8766,7 +8766,7 @@ var require_utilsFS = __commonJS2({
       const { root, currentPath, pathname, hash } = args;
       let resultAnchor = currentPath;
       if (pathname) {
-        resultAnchor = resolveRelativePath3(currentPath, pathname);
+        resultAnchor = resolveRelativePath4(currentPath, pathname);
       }
       resultAnchor = resultAnchor.replace(root, "").replace(/\.(md|ya?ml|html)$/i, "").replace(new RegExp((0, escapeRegExp_1.default)(path_1.sep), "gi"), "_");
       if (hash) {
@@ -25950,11 +25950,11 @@ var require_map_generator = __commonJS2({
   "node_modules/postcss/lib/map-generator.js"(exports2, module2) {
     "use strict";
     var { SourceMapConsumer, SourceMapGenerator } = require_source_map();
-    var { dirname: dirname22, relative: relative10, resolve: resolve22, sep: sep6 } = require("path");
+    var { dirname: dirname22, relative: relative10, resolve: resolve22, sep: sep7 } = require("path");
     var { pathToFileURL } = require("url");
     var Input = require_input();
     var sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator);
-    var pathAvailable = Boolean(dirname22 && resolve22 && relative10 && sep6);
+    var pathAvailable = Boolean(dirname22 && resolve22 && relative10 && sep7);
     var MapGenerator = class {
       constructor(stringify6, root, opts, cssString) {
         this.stringify = stringify6;
@@ -26263,7 +26263,7 @@ var require_map_generator = __commonJS2({
         let cached = this.memoizedURLs.get(path2);
         if (cached)
           return cached;
-        if (sep6 === "\\") {
+        if (sep7 === "\\") {
           path2 = path2.replace(/\\/g, "/");
         }
         let url3 = encodeURI(path2).replace(/[#?]/g, encodeURIComponent);
@@ -26976,8 +26976,8 @@ var require_rule = __commonJS2({
       }
       set selectors(values) {
         let match2 = this.selector ? this.selector.match(/,\s*/) : null;
-        let sep6 = match2 ? match2[0] : "," + this.raw("between", "beforeOpen");
-        this.selector = values.join(sep6);
+        let sep7 = match2 ? match2[0] : "," + this.raw("between", "beforeOpen");
+        this.selector = values.join(sep7);
       }
     };
     module2.exports = Rule;
@@ -142783,6 +142783,7 @@ var import_shelljs3 = __toESM2(require("shelljs"));
 var import_path20 = require("path");
 var import_ssr2 = require("@diplodoc/client/ssr");
 var import_utils14 = __toESM2(require_utils2());
+var import_utilsFS3 = __toESM2(require_utilsFS());
 function processAssets({ args, outputFormat, outputBundlePath, tmpOutputFolder }) {
   switch (outputFormat) {
     case "html":
@@ -142810,7 +142811,7 @@ function processAssetsHtmlRun({ outputBundlePath }) {
   copyFiles(ASSETS_FOLDER, outputBundlePath, bundleAssetFilePath);
 }
 function processAssetsMdRun({ args, tmpOutputFolder }) {
-  const { allowCustomResources, resources } = argv_default2.getConfig();
+  const { input: inputFolderPath, allowCustomResources, resources } = argv_default2.getConfig();
   const pathToConfig = args.config || (0, import_path20.join)(args.input, YFM_CONFIG_FILENAME);
   const pathToRedirects = (0, import_path20.join)(args.input, REDIRECTS_FILENAME);
   const pathToLintConfig = (0, import_path20.join)(args.input, LINT_CONFIG_FILENAME);
@@ -142827,26 +142828,34 @@ function processAssetsMdRun({ args, tmpOutputFolder }) {
     );
     copyFiles(args.input, tmpOutputFolder, resourcePaths);
   }
-  const yamlFiles = (0, import_walk_sync2.default)(args.input, {
-    globs: ["**/*.yaml"],
-    directories: false,
-    includeBasePath: true,
-    ignore: ["**/toc.yaml", (0, import_path20.resolve)(pathToRedirects)]
-  });
-  yamlFiles.forEach((yamlFile) => {
+  const tocYamlFiles = tocs_default.getNavigationPaths().reduce((acc, file) => {
+    if (file.endsWith(".yaml")) {
+      const resolvedPathToFile = (0, import_path20.resolve)(inputFolderPath, file);
+      acc.push(resolvedPathToFile);
+    }
+    return acc;
+  }, []);
+  tocYamlFiles.forEach((yamlFile) => {
     const content = load((0, import_fs7.readFileSync)(yamlFile, "utf8"));
     if (!Object.prototype.hasOwnProperty.call(content, "blocks")) {
       return;
     }
     const contentLinks = findAllValuesByKeys(content, import_ssr2.LINK_KEYS);
-    const localMediaLinks = contentLinks.filter(
-      (link2) => new RegExp(/^\S.*\.(svg|png|gif|jpg|jpeg|bmp|webp|ico)$/gm).test(link2) && (0, import_utils14.isLocalUrl)(link2)
-    );
-    copyFiles(
-      args.input,
-      tmpOutputFolder,
-      localMediaLinks.filter((link2) => checkPathExists(link2, yamlFile))
+    const localMediaLinks = contentLinks.reduce(
+      (acc, link2) => {
+        const linkHasMediaExt = new RegExp(
+          /^\S.*\.(svg|png|gif|jpg|jpeg|bmp|webp|ico)$/gm
+        ).test(link2);
+        if (linkHasMediaExt && (0, import_utils14.isLocalUrl)(link2) && checkPathExists(link2, yamlFile)) {
+          const linkAbsolutePath = (0, import_utilsFS3.resolveRelativePath)(yamlFile, link2);
+          const linkRootPath = linkAbsolutePath.replace(`${inputFolderPath}${import_path20.sep}`, "");
+          acc.push(linkRootPath);
+        }
+        return acc;
+      },
+      []
     );
+    copyFiles(args.input, tmpOutputFolder, localMediaLinks);
   });
 }
 function hasIntersection(array1, array2) {
@@ -147899,8 +147908,8 @@ var path = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep5 = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
-minimatch.sep = sep5;
+var sep6 = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
+minimatch.sep = sep6;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
 var qmark2 = "[^/]";
@@ -153614,7 +153623,7 @@ import_yargs.default.command(build).command(publish).command(translate).option("
   default: false,
   describe: "Run in quiet mode. Don't write logs to stdout",
   type: "boolean"
-}).group(["config", "strict", "quiet", "help", "version"], "Common options:").version(true ? "4.19.1" : "").help().parse((0, import_helpers.hideBin)(process.argv), {}, (err, { strict }, output) => {
+}).group(["config", "strict", "quiet", "help", "version"], "Common options:").version(true ? "4.19.3" : "").help().parse((0, import_helpers.hideBin)(process.argv), {}, (err, { strict }, output) => {
   console.timeEnd(MAIN_TIMER_ID);
   if (err) {
     console.error(err);