@difizen/libro-markdown 1.0.1 → 1.0.3

package/es/markdown-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown-render.d.ts","sourceRoot":"","sources":["../src/markdown-render.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAIrB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,UAAU,MAAM,aAAa,CAAC;AAKrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,0BAA0B,CAAC;AAElC,qBACa,cAAe,YAAW,cAAc;IACnD,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,OAAO,wBAAW;IAClB,eAAe,UAAS;IACM,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGnF,IAAI;IA4DJ,OAAO,CAAC,YAAY;IAsDpB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM;CAIrE"}
+{"version":3,"file":"markdown-render.d.ts","sourceRoot":"","sources":["../src/markdown-render.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAIrB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,UAAU,MAAM,aAAa,CAAC;AAKrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,0BAA0B,CAAC;AAElC,qBACa,cAAe,YAAW,cAAc;IACnD,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC1B,OAAO,wBAAW;IAClB,eAAe,UAAS;IACM,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGnF,IAAI;IA4DJ,OAAO,CAAC,YAAY;IA8DpB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,MAAM;CAKrE"}

package/es/markdown-render.js

@@ -1,5 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _dec, _dec2, _dec3, _class, _class2, _descriptor;
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -81,21 +90,26 @@ export var MarkdownRender = (_dec = singleton({
   }, {
     key: "sanitizeHTML",
     value: function sanitizeHTML(html) {
+      var allowedTags = sanitizeHtml.defaults.allowedTags.concat(['a', 'abbr', 'acronym', 'b', 'blockquote', 'br', 'code', 'col', 'colgroup', 'dd', 'del', 'div', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'li', 'ol', 'p', 'pre', 'q', 's', 'small', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'th', 'tr', 'tt', 'u', 'ul', 'kbd', 'var']);
+      // 构建新的 allowedAttributes，为所有允许的标签添加 'id'
+      var allowedAttributes = Object.fromEntries(allowedTags.map(function (tag) {
+        return [tag, [].concat(_toConsumableArray(sanitizeHtml.defaults.allowedAttributes[tag] || []), ['id'])];
+      }));
       return sanitizeHtml(html, {
-        allowedTags: sanitizeHtml.defaults.allowedTags.concat(['a', 'abbr', 'acronym', 'b', 'blockquote', 'br', 'code', 'col', 'colgroup', 'dd', 'del', 'div', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'li', 'ol', 'p', 'pre', 'q', 's', 'small', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'th', 'tr', 'tt', 'u', 'ul', 'kbd', 'var']),
+        allowedTags: allowedTags,
         // 允许的标签
-        allowedAttributes: {
-          // 允许的属性
-          a: ['href', 'title'],
-          img: ['src', 'alt']
-        }
+        allowedAttributes: _objectSpread(_objectSpread({}, allowedAttributes), {}, {
+          a: ['href', 'title', 'id'],
+          img: ['src', 'alt', 'id']
+        })
       });
     }
   }, {
     key: "render",
     value: function render(markdownText, options) {
       var unsanitizedRenderedMarkdown = this.mkt.render(markdownText, options);
-      return this.sanitizeHTML(unsanitizedRenderedMarkdown);
+      var sanitizeHTML = this.sanitizeHTML(unsanitizedRenderedMarkdown);
+      return sanitizeHTML;
     }
   }]);
   return MarkdownRender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-markdown",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "keywords": [
     "libro",
@@ -33,7 +33,7 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-common": "^1.0.1",
+    "@difizen/libro-common": "^1.0.3",
     "@traptitech/markdown-it-katex": "^3.6.0",
     "@types/markdown-it": "^12.2.3",
     "katex": "^0.16.10",

package/src/markdown-render.ts

@@ -83,61 +83,70 @@ export class MarkdownRender implements MarkdownParser {
 
   // 使用 sanitize-html 清理 HTML
   private sanitizeHTML(html: string): string {
+    const allowedTags = sanitizeHtml.defaults.allowedTags.concat([
+      'a',
+      'abbr',
+      'acronym',
+      'b',
+      'blockquote',
+      'br',
+      'code',
+      'col',
+      'colgroup',
+      'dd',
+      'del',
+      'div',
+      'em',
+      'h1',
+      'h2',
+      'h3',
+      'h4',
+      'h5',
+      'h6',
+      'hr',
+      'i',
+      'img',
+      'li',
+      'ol',
+      'p',
+      'pre',
+      'q',
+      's',
+      'small',
+      'strong',
+      'sub',
+      'sup',
+      'table',
+      'tbody',
+      'td',
+      'th',
+      'tr',
+      'tt',
+      'u',
+      'ul',
+      'kbd',
+      'var',
+    ]);
+    // 构建新的 allowedAttributes，为所有允许的标签添加 'id'
+    const allowedAttributes = Object.fromEntries(
+      allowedTags.map((tag) => [
+        tag,
+        [...(sanitizeHtml.defaults.allowedAttributes[tag] || []), 'id'],
+      ]),
+    );
     return sanitizeHtml(html, {
-      allowedTags: sanitizeHtml.defaults.allowedTags.concat([
-        'a',
-        'abbr',
-        'acronym',
-        'b',
-        'blockquote',
-        'br',
-        'code',
-        'col',
-        'colgroup',
-        'dd',
-        'del',
-        'div',
-        'em',
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'hr',
-        'i',
-        'img',
-        'li',
-        'ol',
-        'p',
-        'pre',
-        'q',
-        's',
-        'small',
-        'strong',
-        'sub',
-        'sup',
-        'table',
-        'tbody',
-        'td',
-        'th',
-        'tr',
-        'tt',
-        'u',
-        'ul',
-        'kbd',
-        'var',
-      ]), // 允许的标签
+      allowedTags, // 允许的标签
       allowedAttributes: {
-        // 允许的属性
-        a: ['href', 'title'],
-        img: ['src', 'alt'],
+        ...allowedAttributes,
+        a: ['href', 'title', 'id'],
+        img: ['src', 'alt', 'id'],
       },
     });
   }
 
   render(markdownText: string, options?: MarkdownRenderOption): string {
     const unsanitizedRenderedMarkdown = this.mkt.render(markdownText, options);
-    return this.sanitizeHTML(unsanitizedRenderedMarkdown);
+    const sanitizeHTML = this.sanitizeHTML(unsanitizedRenderedMarkdown);
+    return sanitizeHTML;
   }
 }