@diplodoc/transform 4.63.3 → 4.63.4

package/lib/plugins/images/index.js

@@ -94,7 +94,7 @@ function replaceSvgContent(content, options) {
     // monoline
     content = content.replace(/\n/g, '');
     // width, height
-    let svgRoot = content.replace(/<svg([^>]*)>.*/g, '$1');
+    let svgRoot = content.replace(/.*?<svg([^>]*)>.*/g, '$1');
     const { width, height } = ((_a = svgRoot
         .match(/(?:width="(.*?)")|(?:height="(.*?)")/g)) === null || _a === void 0 ? void 0 : _a.reduce((acc, val) => {
         const [key, value] = val.split('=');
@@ -110,7 +110,7 @@ function replaceSvgContent(content, options) {
         svgRoot = `${svgRoot} height="${sanitizedHeight}"`;
     }
     if ((!width && options.width) || (!height && options.height)) {
-        content = content.replace(/<svg([^>]*)>/, `<svg${svgRoot}>`);
+        content = content.replace(/.*?<svg([^>]*)>/, `<svg${svgRoot}>`);
     }
     // randomize ids
     content = (0, svgo_1.optimize)(content, {

package/lib/plugins/images/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/images/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/images/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.63.3",
+  "version": "4.63.4",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

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

@@ -141,7 +141,7 @@ function replaceSvgContent(content: string, options: ImageOptions) {
     content = content.replace(/\n/g, '');
 
     // width, height
-    let svgRoot = content.replace(/<svg([^>]*)>.*/g, '$1');
+    let svgRoot = content.replace(/.*?<svg([^>]*)>.*/g, '$1');
 
     const {width, height} = svgRoot
         .match(/(?:width="(.*?)")|(?:height="(.*?)")/g)
@@ -160,7 +160,7 @@ function replaceSvgContent(content: string, options: ImageOptions) {
         svgRoot = `${svgRoot} height="${sanitizedHeight}"`;
     }
     if ((!width && options.width) || (!height && options.height)) {
-        content = content.replace(/<svg([^>]*)>/, `<svg${svgRoot}>`);
+        content = content.replace(/.*?<svg([^>]*)>/, `<svg${svgRoot}>`);
     }
 
     // randomize ids

package/lib/plugins/table/attrs.d.ts

@@ -1,18 +0,0 @@
-export declare class AttrsParser {
-    #private;
-    DELIMITER: string;
-    SEPARATOR: string;
-    QUOTATION: string;
-    ALLOWED_CHARS: RegExp;
-    VALIDATION_CHARS: RegExp;
-    parse(target: string): Record<string, string[]>;
-    private extract;
-    private next;
-    private type;
-    private append;
-    private clear;
-    private isDelimiter;
-    private isSeparator;
-    private isQuotation;
-    private isAllowedChar;
-}

package/lib/plugins/table/attrs.js

@@ -1,172 +0,0 @@
-"use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _AttrsParser_key, _AttrsParser_pending, _AttrsParser_isInsideQuotation, _AttrsParser_didQuotationClosed, _AttrsParser_currentKeyType, _AttrsParser_selectors, _AttrsParser_handlers, _AttrsParser_state;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AttrsParser = void 0;
-class AttrsParser {
-    constructor() {
-        this.DELIMITER = '=';
-        this.SEPARATOR = ' ';
-        this.QUOTATION = '"';
-        /* allowed in keys / values chars */
-        this.ALLOWED_CHARS = /[a-zA-Z0-9_\- {}.|/]/;
-        /* allowed in all query chars */
-        this.VALIDATION_CHARS = /[a-zA-Z0-9_\- {}.#="|/]/;
-        _AttrsParser_key.set(this, '');
-        _AttrsParser_pending.set(this, '');
-        _AttrsParser_isInsideQuotation.set(this, false);
-        _AttrsParser_didQuotationClosed.set(this, false);
-        _AttrsParser_currentKeyType.set(this, void 0);
-        _AttrsParser_selectors.set(this, {
-            id: /#/,
-            class: /\./,
-            attr: /[a-zA-Z-_]/,
-        });
-        _AttrsParser_handlers.set(this, Object.entries(__classPrivateFieldGet(this, _AttrsParser_selectors, "f")));
-        _AttrsParser_state.set(this, {});
-    }
-    parse(target) {
-        /* escape from {} */
-        const content = this.extract(target);
-        if (!content) {
-            return {};
-        }
-        for (const char of content) {
-            this.next(char);
-        }
-        /* end-of-content mark */
-        this.next(this.SEPARATOR);
-        this.clear();
-        return __classPrivateFieldGet(this, _AttrsParser_state, "f");
-    }
-    extract(target) {
-        if (!target.startsWith('{')) {
-            return false;
-        }
-        let balance = 1;
-        for (let i = 1; i < target.length; i++) {
-            const char = target[i];
-            if (char === '}') {
-                balance--;
-            }
-            if (char === '{') {
-                balance++;
-            }
-            if (balance === 0) {
-                const contentInside = target.slice(1, i).trim();
-                return contentInside;
-            }
-            if (balance < 0) {
-                return false;
-            }
-            if (!this.VALIDATION_CHARS.test(char)) {
-                return false;
-            }
-        }
-        return false;
-    }
-    next(value) {
-        if (!__classPrivateFieldGet(this, _AttrsParser_currentKeyType, "f")) {
-            __classPrivateFieldSet(this, _AttrsParser_currentKeyType, this.type(value), "f");
-            if (__classPrivateFieldGet(this, _AttrsParser_currentKeyType, "f") === 'attr') {
-                __classPrivateFieldSet(this, _AttrsParser_pending, value, "f");
-            }
-            return;
-        }
-        if (this.isSeparator(value)) {
-            if (!__classPrivateFieldGet(this, _AttrsParser_pending, "f")) {
-                /* (name= ) construction */
-                if (!__classPrivateFieldGet(this, _AttrsParser_isInsideQuotation, "f")) {
-                    this.append(__classPrivateFieldGet(this, _AttrsParser_key, "f"), ' ');
-                    this.clear();
-                    return;
-                }
-            }
-            /* single key (.name #id contenteditable) */
-            if (!__classPrivateFieldGet(this, _AttrsParser_key, "f") && __classPrivateFieldGet(this, _AttrsParser_pending, "f")) {
-                this.append();
-                this.clear();
-                return;
-            }
-            /* trying to find close quotation */
-            if (__classPrivateFieldGet(this, _AttrsParser_isInsideQuotation, "f") && !__classPrivateFieldGet(this, _AttrsParser_didQuotationClosed, "f")) {
-                __classPrivateFieldSet(this, _AttrsParser_pending, __classPrivateFieldGet(this, _AttrsParser_pending, "f") + value, "f");
-                return;
-            }
-            if (__classPrivateFieldGet(this, _AttrsParser_isInsideQuotation, "f") && __classPrivateFieldGet(this, _AttrsParser_didQuotationClosed, "f")) {
-                this.append(__classPrivateFieldGet(this, _AttrsParser_key, "f"), __classPrivateFieldGet(this, _AttrsParser_pending, "f"));
-            }
-            if (!__classPrivateFieldGet(this, _AttrsParser_isInsideQuotation, "f") && !__classPrivateFieldGet(this, _AttrsParser_didQuotationClosed, "f")) {
-                this.append(__classPrivateFieldGet(this, _AttrsParser_key, "f"), __classPrivateFieldGet(this, _AttrsParser_pending, "f"));
-            }
-            this.clear();
-            return;
-        }
-        if (this.isAllowedChar(value)) {
-            __classPrivateFieldSet(this, _AttrsParser_pending, __classPrivateFieldGet(this, _AttrsParser_pending, "f") + value, "f");
-            return;
-        }
-        if (this.isQuotation(value)) {
-            if (__classPrivateFieldGet(this, _AttrsParser_isInsideQuotation, "f")) {
-                __classPrivateFieldSet(this, _AttrsParser_didQuotationClosed, true, "f");
-            }
-            else {
-                __classPrivateFieldSet(this, _AttrsParser_isInsideQuotation, true, "f");
-            }
-        }
-        if (this.isDelimiter(value)) {
-            /* symbol is not delimiter, adding it to value */
-            if (__classPrivateFieldGet(this, _AttrsParser_key, "f")) {
-                __classPrivateFieldSet(this, _AttrsParser_pending, __classPrivateFieldGet(this, _AttrsParser_pending, "f") + value, "f");
-                return;
-            }
-            __classPrivateFieldSet(this, _AttrsParser_key, __classPrivateFieldGet(this, _AttrsParser_pending, "f"), "f");
-            __classPrivateFieldSet(this, _AttrsParser_pending, '', "f");
-        }
-    }
-    type(of) {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _AttrsParser_handlers, "f").find(([_, regex]) => regex.test(of))) === null || _a === void 0 ? void 0 : _a[0];
-    }
-    append(key = __classPrivateFieldGet(this, _AttrsParser_currentKeyType, "f"), value = __classPrivateFieldGet(this, _AttrsParser_pending, "f")) {
-        if (!key) {
-            return;
-        }
-        if (!__classPrivateFieldGet(this, _AttrsParser_state, "f")[key]) {
-            __classPrivateFieldGet(this, _AttrsParser_state, "f")[key] = [];
-        }
-        __classPrivateFieldGet(this, _AttrsParser_state, "f")[key].push(value);
-    }
-    clear() {
-        __classPrivateFieldSet(this, _AttrsParser_key, '', "f");
-        __classPrivateFieldSet(this, _AttrsParser_pending, '', "f");
-        __classPrivateFieldSet(this, _AttrsParser_isInsideQuotation, false, "f");
-        __classPrivateFieldSet(this, _AttrsParser_didQuotationClosed, false, "f");
-        __classPrivateFieldSet(this, _AttrsParser_currentKeyType, undefined, "f");
-    }
-    isDelimiter(target) {
-        return target === this.DELIMITER;
-    }
-    isSeparator(target) {
-        return target === this.SEPARATOR;
-    }
-    isQuotation(target) {
-        return target === this.QUOTATION;
-    }
-    isAllowedChar(target) {
-        return this.ALLOWED_CHARS.test(target);
-    }
-}
-exports.AttrsParser = AttrsParser;
-_AttrsParser_key = new WeakMap(), _AttrsParser_pending = new WeakMap(), _AttrsParser_isInsideQuotation = new WeakMap(), _AttrsParser_didQuotationClosed = new WeakMap(), _AttrsParser_currentKeyType = new WeakMap(), _AttrsParser_selectors = new WeakMap(), _AttrsParser_handlers = new WeakMap(), _AttrsParser_state = new WeakMap();
-//# sourceMappingURL=attrs.js.map

package/lib/plugins/table/attrs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"attrs.js","sourceRoot":"","sources":["../../../src/transform/plugins/table/attrs.ts"],"names":[],"mappings":"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"}