@diplodoc/transform 4.14.2 → 4.16.0

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

@@ -5,7 +5,6 @@ import {
     defaultTransformLink,
     findBlockTokens,
     getHrefTokenAttr,
-    getPublicPath,
     headingInfo,
     isLocalUrl,
 } from '../../utils';
@@ -13,7 +12,7 @@ import {getFileTokens, isFileExists} from '../../utilsFS';
 import Token from 'markdown-it/lib/token';
 import {Logger} from 'src/transform/log';
 import {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';
-import path, {isAbsolute, resolve} from 'path';
+import path, {isAbsolute, parse, relative, resolve} from 'path';
 import {StateCore} from 'src/transform/typings';
 
 function getTitleFromTokens(tokens: Token[]) {
@@ -84,11 +83,34 @@ interface ProcOpts extends MarkdownItPluginOpts {
     transformLink: (v: string) => string;
     notFoundCb: (v: string) => void;
     needSkipLinkFn: (v: string) => boolean;
+    getPublicPath: (options: ProcOpts, v?: string) => string;
+}
+
+function getDefaultPublicPath(
+    {
+        file,
+        path,
+    }: {
+        file?: string;
+        path?: string;
+    },
+    input?: string | null,
+) {
+    return relative(parse(path || '').dir, input || file || '');
 }
 
 // eslint-disable-next-line complexity
 function processLink(state: StateCore, tokens: Token[], idx: number, opts: ProcOpts) {
-    const {path: startPath, root, transformLink, notFoundCb, needSkipLinkFn, log} = opts;
+    const {
+        path: startPath,
+        root,
+        transformLink,
+        notFoundCb,
+        needSkipLinkFn,
+        log,
+        getPublicPath = getDefaultPublicPath,
+    } = opts;
+
     const currentPath = state.env.path || startPath;
     const linkToken = tokens[idx];
     const nextToken = tokens[idx + 1];
@@ -162,7 +184,8 @@ function processLink(state: StateCore, tokens: Token[], idx: number, opts: ProcO
     }
 
     let newPathname = '';
-    if (!isAbsolute(href)) {
+
+    if (!isAbsolute(href) && !href.includes('//')) {
         newPathname = getPublicPath(opts, file);
 
         href = url.format({

package/src/transform/typings.ts

@@ -47,6 +47,7 @@ export interface OptionsType {
     root?: string;
     rootPublicPath?: string;
     transformLink?: (href: string) => string;
+    getPublicPath?: (options: OptionsType, href?: string) => string;
     [x: string]: unknown;
 }
 

package/src/transform/utils.ts

@@ -1,5 +1,4 @@
 import url from 'url';
-import {relative, resolve} from 'path';
 import Token from 'markdown-it/lib/token';
 
 export function isLocalUrl(url: string) {
@@ -104,23 +103,18 @@ export function defaultTransformLink(href: string) {
     return href;
 }
 
-export function getPublicPath(
+export function getDefaultPublicPath(
     {
         path,
-        root,
-        rootPublicPath,
         transformLink,
     }: {
         path?: string;
-        root?: string;
-        rootPublicPath?: string;
         transformLink?: (href: string) => string;
     },
     input?: string | null,
 ) {
     const currentPath = input || path || '';
-    const filePath = relative(resolve(root || '', rootPublicPath || ''), currentPath);
     const transformer = transformLink || defaultTransformLink;
-    const href = transformer(filePath);
+    const href = transformer?.(currentPath) ?? currentPath;
     return href;
 }

package/src/transform/utilsFS.ts

@@ -1,11 +1,11 @@
 import {readFileSync, statSync} from 'fs';
 import type {Dictionary} from 'lodash';
 import escapeRegExp from 'lodash/escapeRegExp';
-
-import {join, parse, resolve, sep} from 'path';
+import {join, parse, relative, resolve, sep} from 'path';
 
 import liquid from './liquid';
 import {StateCore} from './typings';
+import {defaultTransformLink} from './utils';
 
 const filesCache: Record<string, string> = {};
 
@@ -127,3 +127,24 @@ export function getSinglePageAnchorId(args: {
 
     return `#${resultAnchor}`;
 }
+
+export function getPublicPath(
+    {
+        path,
+        root,
+        rootPublicPath,
+        transformLink,
+    }: {
+        path?: string;
+        root?: string;
+        rootPublicPath?: string;
+        transformLink?: (href: string) => string;
+    },
+    input?: string | null,
+) {
+    const currentPath = input || path || '';
+    const filePath = relative(resolve(root || '', rootPublicPath || ''), currentPath);
+    const transformer = transformLink || defaultTransformLink;
+    const href = transformer(filePath);
+    return href;
+}