@diplodoc/transform 4.37.0 → 4.38.0

package/src/transform/plugins/includes/index.ts

@@ -2,7 +2,13 @@ import {bold} from 'chalk';
 import Token from 'markdown-it/lib/token';
 
 import {StateCore} from '../../typings';
-import {GetFileTokensOpts, getFileTokens, getFullIncludePath, isFileExists} from '../../utilsFS';
+import {
+    GetFileTokensOpts,
+    getFileTokens,
+    getFullIncludePath,
+    getRealPath,
+    isFileExists,
+} from '../../utilsFS';
 import {findBlockTokens} from '../../utils';
 import {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';
 
@@ -44,13 +50,8 @@ function unfoldIncludes(md: MarkdownItIncluded, state: StateCore, path: string,
 
                 const fullIncludePath = getFullIncludePath(includePath, root, path);
 
-                let pathname = fullIncludePath;
-                let hash = '';
-                const hashIndex = fullIncludePath.lastIndexOf('#');
-                if (hashIndex > -1 && !isFileExists(pathname)) {
-                    pathname = fullIncludePath.slice(0, hashIndex);
-                    hash = fullIncludePath.slice(hashIndex + 1);
-                }
+                // Check the real path of the file in case of a symlink
+                let pathname = getRealPath(fullIncludePath);
 
                 if (!pathname.startsWith(root)) {
                     i++;
@@ -58,6 +59,13 @@ function unfoldIncludes(md: MarkdownItIncluded, state: StateCore, path: string,
                     continue;
                 }
 
+                let hash = '';
+                const hashIndex = fullIncludePath.lastIndexOf('#');
+                if (hashIndex > -1 && !isFileExists(pathname)) {
+                    pathname = fullIncludePath.slice(0, hashIndex);
+                    hash = fullIncludePath.slice(hashIndex + 1);
+                }
+
                 // Check the existed included store and extract it
                 const included = md.included?.[pathname];
 

package/src/transform/sanitize.ts

@@ -5,6 +5,7 @@ import * as cheerio from 'cheerio';
 import css from 'css';
 
 import {CssWhiteList} from './typings';
+import log from './log';
 
 const htmlTags = [
     'a',
@@ -560,8 +561,11 @@ function sanitizeStyleTags(dom: cheerio.CheerioAPI, cssWhiteList: CssWhiteList)
             });
 
             dom(element).text(css.stringify(parsedCSS));
-        } catch {
+        } catch (error) {
             dom(element).remove();
+
+            const errorMessage = error instanceof Error ? error.message : `${error}`;
+            log.info(errorMessage);
         }
     });
 }

package/src/transform/utilsFS.ts

@@ -1,6 +1,6 @@
 import type {Dictionary} from 'lodash';
 
-import {readFileSync, statSync} from 'fs';
+import {readFileSync, realpathSync, statSync} from 'fs';
 import escapeRegExp from 'lodash/escapeRegExp';
 import {join, parse, relative, resolve, sep} from 'path';
 
@@ -168,3 +168,11 @@ export function getRelativePath(path: string, toPath: string) {
     const parentPath = pathDirs.join(sep);
     return relative(parentPath, toPath);
 }
+
+export function getRealPath(symlinkPath: string): string {
+    try {
+        return realpathSync(symlinkPath);
+    } catch (err) {
+        return symlinkPath;
+    }
+}